date:20160111

[Libreoffice-commits] dev-tools.git: clang/README clang/rename.cxx clang/testmemberfunction.cxx

2016-01-11 Thread Miklos Vajna

 clang/README |2 +-
 clang/rename.cxx |   35 +++
 clang/testmemberfunction.cxx |   20 
 3 files changed, 56 insertions(+), 1 deletion(-)

New commits:
commit cd61d6342eea3b028d13670962327af698b5317f
Author: Miklos Vajna 
Date:   Mon Jan 11 09:08:59 2016 +0100

clang: also handle member functions

diff --git a/clang/README b/clang/README
index fc7cd31..948e223 100644
--- a/clang/README
+++ b/clang/README
@@ -14,7 +14,7 @@ Pros:
 
 Cons:
 
-- handles only rename of class members so far
+- handles only rename of data members and member functions so far
 - only tested with clang 3.5/3.7
 
 == Hello world
diff --git a/clang/rename.cxx b/clang/rename.cxx
index 60bcce7..352a90b 100644
--- a/clang/rename.cxx
+++ b/clang/rename.cxx
@@ -48,6 +48,8 @@ public:
 {
 }
 
+// Data member names.
+
 /*
  * class C
  * {
@@ -172,6 +174,39 @@ public:
 }
 return true;
 }
+
+// Member function names.
+
+/*
+ * class C
+ * {
+ * public:
+ * foo(); <- Handles this.
+ * };
+ *
+ * C::foo() <- And this.
+ * {
+ * }
+ *
+ * ...
+ *
+ * aC.foo(); <- And this.
+ */
+bool VisitCXXMethodDecl(const clang::CXXMethodDecl* pDecl)
+{
+std::string aName = pDecl->getQualifiedNameAsString();
+const std::map::const_iterator it = 
mrRewriter.getNameMap().find(aName);
+if (it != mrRewriter.getNameMap().end())
+{
+clang::SourceLocation aLocation = pDecl->getLocation();
+if (maHandledLocations.find(aLocation) == maHandledLocations.end())
+{
+mrRewriter.ReplaceText(aLocation, 
pDecl->getNameAsString().length(), it->second);
+maHandledLocations.insert(aLocation);
+}
+}
+return true;
+}
 };
 
 class RenameASTConsumer : public clang::ASTConsumer
diff --git a/clang/testmemberfunction.cxx b/clang/testmemberfunction.cxx
new file mode 100644
index 000..e307304
--- /dev/null
+++ b/clang/testmemberfunction.cxx
@@ -0,0 +1,20 @@
+namespace ns
+{
+class C
+{
+public:
+void foo(int x);
+};
+}
+
+void ns::C::foo(int /*x*/)
+{
+}
+
+int main(int /*argc*/, char** /*argv*/)
+{
+ns::C aC;
+aC.foo(0);
+}
+
+/* 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: include/svx svx/source

2016-01-11 Thread Miklos Vajna

 include/svx/svddrag.hxx |   10 +-
 svx/source/engine3d/scene3d.cxx |2 +-
 svx/source/svdraw/svdcrtv.cxx   |6 +++---
 svx/source/svdraw/svddrag.cxx   |2 +-
 svx/source/svdraw/svdoashp.cxx  |2 +-
 svx/source/svdraw/svdobj.cxx|2 +-
 svx/source/svdraw/svdocapt.cxx  |2 +-
 svx/source/svdraw/svdocirc.cxx  |   26 +-
 svx/source/svdraw/svdoedge.cxx  |2 +-
 svx/source/svdraw/svdomeas.cxx  |2 +-
 svx/source/svdraw/svdopath.cxx  |4 ++--
 svx/source/svdraw/svdotxdr.cxx  |2 +-
 svx/source/table/svdotable.cxx  |2 +-
 13 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 8fd9020b2b5ae1024dbf866cd84cf28258aba232
Author: Miklos Vajna 
Date:   Mon Jan 11 09:09:14 2016 +0100

svx: SdrDragStat::GetPointAnz() -> GetPointCount()

Change-Id: Ib8728408a81c655c36b46a8483970c38e9a40bc4

diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index ac2a978..ab285bd 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -84,14 +84,14 @@ public:
 SdrPageView* GetPageView() const { return pPageView; }
 void SetPageView(SdrPageView* pPV)   { pPageView=pPV; }
 const Point& GetPoint(sal_uIntPtr nNum) const{ return *aPnts[nNum]; }
-sal_uIntPtrGetPointAnz() const   { return aPnts.size(); }
+sal_uIntPtrGetPointCount() const   { return aPnts.size(); }
 const Point& GetStart() const{ return GetPoint(0); }
 Point&   Start() { return Pnt(0); }
-const Point& GetPrev() const { return 
GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
-Point& Prev(){ return 
Pnt(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
+const Point& GetPrev() const { return 
GetPoint(GetPointCount()-(GetPointCount()>=2 ? 2:1)); }
+Point& Prev(){ return 
Pnt(GetPointCount()-(GetPointCount()>=2 ? 2:1)); }
 const Point& GetPos0() const { return aPos0;  }
-const Point& GetNow() const  { return 
GetPoint(GetPointAnz()-1); }
-Point&   Now()   { return 
Pnt(GetPointAnz()-1); }
+const Point& GetNow() const  { return 
GetPoint(GetPointCount()-1); }
+Point&   Now()   { return 
Pnt(GetPointCount()-1); }
 const Point& GetRealNow() const  { return aRealNow; }
 Point&   RealNow()   { return aRealNow; }
 const Point& GetRef1() const { return aRef1;  }
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 2d07749..53d35ac 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -702,7 +702,7 @@ bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd 
eCmd)
 aRect1.Justify();
 NbcSetSnapRect(aRect1);
 SetRectsDirty();
-return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2);
+return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointCount()>=2);
 }
 
 bool E3dScene::BckCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index d9140bf..0e4719f 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -601,7 +601,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
 
 if (pAktCreate!=nullptr)
 {
-sal_uIntPtr nCount=maDragStat.GetPointAnz();
+sal_uIntPtr nCount=maDragStat.GetPointCount();
 
 if (nCount<=1 && eCmd==SDRCREATE_FORCEEND)
 {
@@ -710,7 +710,7 @@ void SdrCreateView::BckCreateObj()
 {
 if (pAktCreate!=nullptr)
 {
-if (maDragStat.GetPointAnz()<=2 )
+if (maDragStat.GetPointCount()<=2 )
 {
 BrkCreateObj();
 }
@@ -791,7 +791,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, 
sal_Bool bFull*/)
 if(pCircObj && OBJ_CIRC != pCircObj->GetObjIdentifier())
 {
 // #i103058# Allow SolidDragging with four points
-if(maDragStat.GetPointAnz() < 4)
+if(maDragStat.GetPointCount() < 4)
 {
 bUseSolidDragging = false;
 }
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 91cd2d1..411cc91 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -127,7 +127,7 @@ Fraction SdrDragStat::GetYFact() const
 void SdrDragStat::TakeCreateRect(Rectangle& rRect) const
 {
 rRect=Rectangle(GetStart(),GetNow());
-if (GetPointAnz()>=2) {
+if (GetPointCount()>=2) {
 Point aBtmRgt(GetPoint(1));
 rRect.Right()=aBtmRgt.X();
 rRect.Bottom()=aBtmRgt.Y();
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source

[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp

2016-01-11 Thread Miklos Vajna

 loolwsd/ChildProcessSession.cpp |3 +--
 loolwsd/ChildProcessSession.hpp |1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1fbe0580e1fb07e00038c08e04792c3f76e88d12
Author: Miklos Vajna 
Date:   Mon Jan 11 09:18:37 2016 +0100

loolwsd: -Werror,-Wunused-private-field

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 7db9964..ac2ed50 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -42,7 +42,7 @@ std::mutex ChildProcessSession::_mutex;
 
 ChildProcessSession::ChildProcessSession(const std::string& id,
  std::shared_ptr 
ws,
- LibreOfficeKit *loKit,
+ LibreOfficeKit* /*loKit*/,
  LibreOfficeKitDocument * 
loKitDocument,
  const std::string& jailId,
  
std::function 
onLoad,
@@ -50,7 +50,6 @@ ChildProcessSession::ChildProcessSession(const std::string& 
id,
 LOOLSession(id, Kind::ToMaster, ws),
 _loKitDocument(loKitDocument),
 _multiView(getenv("LOK_VIEW_CALLBACK")),
-_loKit(loKit),
 _jailId(jailId),
 _viewId(0),
 _clientPart(0),
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index 61ae15a..7642399 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -86,7 +86,6 @@ private:
 LibreOfficeKitDocument *_loKitDocument;
 std::string _docType;
 const bool _multiView;
-LibreOfficeKit *_loKit;
 const std::string _jailId;
 /// View ID, returned by createView() or 0 by default.
 int _viewId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2016-01-11 Thread Jan Holesovsky

Hi all,

Michael Meeks píše v Čt 07. 01. 2016 v 16:11 +:

> + 5.1.0 RC2
> + deadline early next week for 5.1.0 RC2 & branch & hard-code-freeze.

There is one late feature we (the Design team) would like to ask for
late inclusion; sorry for not discussing it in the ESC on Thursday:

https://gerrit.libreoffice.org/#/c/21260/

The background:

To avoid too many 'Save' buttons in the toolbar ('normal' save, Save As,
Save Remote File, etc.), the solution taken was to introduce a dropdown
for the Save button where the less used functionality would be present
and accessible to the user.

Unfortunately that introduced a problem when the 'Save' button is
disabled: What to do with the dropdown when the Save itself is disabled?
How to behave the most logical way?

The solution (in the above gerrit request):

After some discussion & competitive analysis, we decided to kill the
possibility to disable Save, ie. now Save is always enabled.

We had an option for 'never disabling Save' already before, but we did
not make it the default yet, as too many people were using that as an
indicator of the changes in the document.

To provide the indicator functionality, now the 'Save' icon changes when
there are unsaved changes, and we'll have an alternative design (save
icon with an added asterisk) for the "unsaved changes present" state.
The updated icon is still to be provided, but should be in time for the
RC2 tagging.

Hope there are no concerns; the only alternative would be to revert the
Save-related changes.

+1's in gerrit appreciated, big thanks to Maxim for implementing the
feature & Samuel for backporting to libreoffice-5-1 gerrit.

Thank you,
Kendy

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

[Bug 55066] FILEOPEN: flaws in importing 123 files

2016-01-11 Thread bugzilla-daemon

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

--- Comment #18 from Shubham Tibra  ---
(In reply to osnola from comment #17)
> Hello,
> 
> (In reply to Shubham Tibra from comment #15)
> > I'd like to work on this bug, is it still open to work on.
> > 
> > But I'll need some help. I am new here.
> > 
> > I didn't understand how the import code works and how it uses the file
> > format?
> > 
> > Can someone help me?
> 
> the source of the LibreOffice's filter(*) are in sc/source/filter/lotus.
> For instance, the version number of universal-content.123 (0x1005) is read in
> https://docs.libreoffice.org/sc/html/filter_8cxx_source.html#l00109, so this
> function will return eWK123...
> 
> (*) concerning older Lotus's files, there are read via the libwps's filter :
> the entry point on the source is
> http://sourceforge.net/p/libwps/code/ci/master/tree/src/lib/Lotus.cpp#l310
> ...

Got it.Thanks for the help :)

-- 
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: 8 commits - accessibility/inc basctl/source basic/source chart2/source comphelper/source compilerplugins/clang cui/source dbaccess/source

2016-01-11 Thread Noel Grandin

 accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx   |1 
 accessibility/inc/accessibility/extended/AccessibleGridControl.hxx |1 
 basctl/source/basicide/baside2.cxx |   47 
+++---
 basctl/source/basicide/baside2.hxx |   22 ++--
 basctl/source/basicide/baside2b.cxx|   10 --
 basctl/source/basicide/baside3.cxx |   11 --
 basctl/source/basicide/bastype2.cxx|   13 --
 basctl/source/basicide/scriptdocument.cxx  |4 
 basctl/source/dlged/dlgedfunc.cxx  |   24 +
 basctl/source/dlged/dlgedobj.cxx   |6 -
 basctl/source/inc/baside3.hxx  |4 
 basctl/source/inc/bastype2.hxx |2 
 basctl/source/inc/dlgedfunc.hxx|   12 +-
 basctl/source/inc/dlgedobj.hxx |2 
 basctl/source/inc/scriptdocument.hxx   |2 
 basic/source/classes/sbunoobj.cxx  |4 
 basic/source/comp/buffer.cxx   |   25 +
 basic/source/inc/buffer.hxx|8 -
 basic/source/inc/sbunoobj.hxx  |2 
 basic/source/sbx/sbxdec.cxx|3 
 basic/source/sbx/sbxdec.hxx|2 
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx|5 -
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx|2 
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |3 
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx |2 
 chart2/source/controller/dialogs/DataBrowser.cxx   |6 -
 chart2/source/controller/dialogs/DataBrowser.hxx   |3 
 chart2/source/controller/dialogs/DialogModel.cxx   |7 -
 chart2/source/controller/dialogs/DialogModel.hxx   |2 
 chart2/source/controller/dialogs/res_ErrorBar.cxx  |4 
 chart2/source/controller/inc/res_ErrorBar.hxx  |2 
 chart2/source/inc/CloneHelper.hxx  |   19 
 chart2/source/inc/CommonFunctors.hxx   |   40 

 chart2/source/inc/LifeTime.hxx |2 
 chart2/source/inc/PropertyHelper.hxx   |   27 -
 chart2/source/inc/chartview/DrawModelWrapper.hxx   |1 
 chart2/source/tools/LifeTime.cxx   |5 -
 chart2/source/view/main/DrawModelWrapper.cxx   |4 
 comphelper/source/misc/instancelocker.cxx  |6 -
 comphelper/source/misc/instancelocker.hxx  |2 
 compilerplugins/clang/plugin.cxx   |6 -
 compilerplugins/clang/unusedmethods.cxx|   38 
++--
 compilerplugins/clang/unusedmethods.py |   47 
+-
 cui/source/customize/cfg.cxx   |   19 
 cui/source/dialogs/SpellDialog.cxx |5 -
 cui/source/dialogs/cuihyperdlg.cxx |3 
 cui/source/dialogs/hangulhanjadlg.cxx  |6 -
 cui/source/dialogs/iconcdlg.cxx|7 -
 cui/source/inc/SpellDialog.hxx |2 
 cui/source/inc/cfg.hxx |   10 +-
 cui/source/inc/cuihyperdlg.hxx |2 
 cui/source/inc/cuitabline.hxx  |4 
 cui/source/inc/iconcdlg.hxx|5 -
 cui/source/inc/swpossizetabpage.hxx|2 
 cui/source/options/dbregistersettings.hxx  |4 
 cui/source/options/optaboutconfig.cxx  |7 -
 cui/source/options/optaboutconfig.hxx  |2 
 cui/source/tabpages/swpossizetabpage.cxx   |4 
 cui/source/tabpages/tpline.cxx |4 
 cui/source/tabpages/tplneend.cxx   |5 -
 dbaccess/source/core/api/RowSet.cxx|6 -
 dbaccess/source/core/api/RowSet.hxx|9 -
 dbaccess/source/core/api/RowSetCache.cxx   |8 -
 dbaccess/source/core/api/RowSetCache.hxx   |2 
 dbaccess/source/core/api/RowSetCacheIter

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

2016-01-11 Thread Xisco Fauli

 filter/source/svg/svgreader.cxx |  148 +++-
 1 file changed, 87 insertions(+), 61 deletions(-)

New commits:
commit e6e8a8650d4729965cb694d37592fd418c949a79
Author: Xisco Fauli 
Date:   Sat Dec 19 22:48:04 2015 +0100

tdf#47262 SVG: Parse gradient styles twice if the referred...

 gradient can't be found the first time

Conflicts:
filter/source/svg/svgreader.cxx

Change-Id: Iaadaac13738dd0d45832a8f38787b22b1d15de29
Reviewed-on: https://gerrit.libreoffice.org/20833
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index b7a20ba..16c9cf8 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -160,7 +160,8 @@ struct AnnotatingVisitor
   StateMap& 
rStateMap,
   const State&   
rInitialState,
   const uno::Reference& 
xDocumentHandler,
-  std::vector< uno::Reference >& 
rUseElementVector) :
+  std::vector< uno::Reference >& 
rUseElementVector,
+  bool& rGradientNotFound) :
 mnCurrStateId(0),
 maCurrState(),
 maParentStates(),
@@ -170,7 +171,8 @@ struct AnnotatingVisitor
 maGradientVector(),
 maGradientStopVector(),
 maElementVector(),
-mrUseElementVector(rUseElementVector)
+mrUseElementVector(rUseElementVector),
+mrGradientNotFound(rGradientNotFound)
 {
 maParentStates.push_back(rInitialState);
 }
@@ -215,6 +217,12 @@ struct AnnotatingVisitor
 
 if( aFound != maGradientIdMap.end() )
 maGradientVector.back() = 
maGradientVector[aFound->second];
+else
+{
+mrGradientNotFound = true;
+maGradientVector.pop_back();
+return;
+}
 }
 
 // do that after dereferencing, to prevent hyperlinked
@@ -252,6 +260,12 @@ struct AnnotatingVisitor
 
 if( aFound != maGradientIdMap.end() )
 maGradientVector.back() = 
maGradientVector[aFound->second];
+else
+{
+mrGradientNotFound = true;
+maGradientVector.pop_back();
+return;
+}
 }
 
 // do that after dereferencing, to prevent hyperlinked
@@ -362,70 +376,73 @@ struct AnnotatingVisitor
 }
 default:
 {
-// init state. inherit defaults from parent.
-maCurrState = maParentStates.back();
-maCurrState.maTransform.identity();
-maCurrState.maViewBox.reset();
-
-// first parse 'color' and 'style' as 'fill' and 'stroke' 
might depend on them
-// if their values are "currentColor" and parsed previously
-uno::Reference 
xNodeColor(xAttributes->getNamedItem("color"));
-if(xNodeColor.is())
-parseAttribute(XML_COLOR, xNodeColor->getNodeValue());
-
-uno::Reference 
xNodeStyle(xAttributes->getNamedItem("style"));
-if(xNodeStyle.is())
-parseStyle(xNodeStyle->getNodeValue());
-
-const sal_Int32 nNumAttrs( xAttributes->getLength() );
-OUString sAttributeValue;
-
-//now, parse the rest of attributes
-for( sal_Int32 i=0; iitem(i)->getNodeValue();
-const sal_Int32 nTokenId(
-getTokenId(xAttributes->item(i)->getNodeName()));
-if( XML_ID == nTokenId )
+// init state. inherit defaults from parent.
+maCurrState = maParentStates.back();
+maCurrState.maTransform.identity();
+maCurrState.maViewBox.reset();
+
+// first parse 'color' and 'style' as 'fill' and 'stroke' 
might depend on them
+// if their values are "currentColor" and parsed previously
+uno::Reference 
xNodeColor(xAttributes->getNamedItem("color"));
+if(xNodeColor.is())
+parseAttribute(XML_COLOR, xNodeColor->getNodeValue());
+
+uno::Reference 
xNodeStyle(xAttributes->getNamedItem("style"));
+if(xNodeStyle.is())
+parseStyle(xNodeStyle->getNodeValue());
+
+const sal_Int32 nNumAttrs( xAttributes->getLength() );
+OUString sAttributeValue;
+
+//now, parse the rest of attributes
+for( sal_Int32 i=0; ii

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

2016-01-11 Thread Jan Holesovsky

 loleaflet/debug/document/document_simple_example.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f3f22cdc2b793dcef5b7d70c1b582cb916bc53b
Author: Jan Holesovsky 
Date:   Mon Jan 11 09:59:02 2016 +0100

Actually let's default to 'HideWhitespace' in this branch (not in master).

diff --git a/loleaflet/debug/document/document_simple_example.html 
b/loleaflet/debug/document/document_simple_example.html
index 3042922..1fe911e 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -67,7 +67,7 @@
 var renderingOptions = {
 ".uno:HideWhitespace": {
 "type": "boolean",
-"value": "false"
+"value": "true"
 },
 ".uno:ShowBorderShadow": {
 "type": "boolean",
___
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' - bean/pom.officebean.xml javaunohelper/pom.juh.xml jurt/pom.jurt.xml ridljar/pom.ridl.xml ridljar/pom.unoloader.xml unoil/pom.unoil.xml

2016-01-11 Thread David Ostrovsky

 bean/pom.officebean.xml   |   44 
 javaunohelper/pom.juh.xml |   44 
 jurt/pom.jurt.xml |   44 
 ridljar/pom.ridl.xml  |   44 
 ridljar/pom.unoloader.xml |   44 
 unoil/pom.unoil.xml   |   44 
 6 files changed, 264 insertions(+)

New commits:
commit 708eab71f4d099a3887d32e59ef817db50324698
Author: David Ostrovsky 
Date:   Tue Dec 1 00:20:09 2015 +0100

Expose metadata to deploy LibreOffice artifacts on Maven Central

As outlined in the requirements to deploy the artifacts on Maven
Central, the metdata must be provided:

* Project Name, Description and URL
* License Information
* Developer Information
* SCM Information

[1] http://central.sonatype.org/pages/requirements.html

Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318
Reviewed-on: https://gerrit.libreoffice.org/20315
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 9ca2de8c5995657973665189903aa2eebe0ef69a)
Reviewed-on: https://gerrit.libreoffice.org/20813
Reviewed-by: David Ostrovsky 
Reviewed-by: Miklos Vajna 

diff --git a/bean/pom.officebean.xml b/bean/pom.officebean.xml
new file mode 100644
index 000..8d366d2
--- /dev/null
+++ b/bean/pom.officebean.xml
@@ -0,0 +1,44 @@
+
+  4.0.0
+  org.libreoffice
+  officebean
+  @version@
+  jar
+  LibreOffice - LOKit4Java
+  LOKit4Java
+  https://www.libreoffice.org
+
+  
+
+  Mozilla Public License, Version 2.0
+  https://www.mozilla.org/en-US/MPL/2.0
+  repo
+
+  
+
+  
+http://cgit.freedesktop.org/libreoffice/core
+
https://gerrit.libreoffice.org/#/admin/projects/core
+  
+
+  
+
+  The Document Foundation
+
+  
+
+  
+
+  LibreOffice Development Mailing List
+  libreoffice@lists.freedesktop.org
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  http://lists.freedesktop.org/archives/libreoffice
+
+  
+
+  
+https://bugs.documentfoundation.org
+LibreOffice Issue Tracker
+  
+
diff --git a/javaunohelper/pom.juh.xml b/javaunohelper/pom.juh.xml
new file mode 100644
index 000..f132ead
--- /dev/null
+++ b/javaunohelper/pom.juh.xml
@@ -0,0 +1,44 @@
+
+  4.0.0
+  org.libreoffice
+  juh
+  @version@
+  jar
+  LibreOffice - Java UNO helper
+  Java UNO helper
+  https://www.libreoffice.org
+
+  
+
+  Mozilla Public License, Version 2.0
+  https://www.mozilla.org/en-US/MPL/2.0
+  repo
+
+  
+
+  
+http://cgit.freedesktop.org/libreoffice/core
+
https://gerrit.libreoffice.org/#/admin/projects/core
+  
+
+  
+
+  The Document Foundation
+
+  
+
+  
+
+  LibreOffice Development Mailing List
+  libreoffice@lists.freedesktop.org
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  http://lists.freedesktop.org/archives/libreoffice
+
+  
+
+  
+https://bugs.documentfoundation.org
+LibreOffice Issue Tracker
+  
+
diff --git a/jurt/pom.jurt.xml b/jurt/pom.jurt.xml
new file mode 100644
index 000..25e3403
--- /dev/null
+++ b/jurt/pom.jurt.xml
@@ -0,0 +1,44 @@
+
+  4.0.0
+  org.libreoffice
+  jurt
+  @version@
+  jar
+  LibreOffice - Java Uno Runtime
+  Java Uno Runtime
+  https://www.libreoffice.org
+
+  
+
+  Mozilla Public License, Version 2.0
+  https://www.mozilla.org/en-US/MPL/2.0
+  repo
+
+  
+
+  
+http://cgit.freedesktop.org/libreoffice/core
+
https://gerrit.libreoffice.org/#/admin/projects/core
+  
+
+  
+
+  The Document Foundation
+
+  
+
+  
+
+  LibreOffice Development Mailing List
+  libreoffice@lists.freedesktop.org
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  http://lists.freedesktop.org/archives/libreoffice
+
+  
+
+  
+https://bugs.documentfoundation.org
+LibreOffice Issue Tracker
+  
+
diff --git a/ridljar/pom.ridl.xml b/ridljar/pom.ridl.xml
new file mode 100644
index 000..96b862a0
--- /dev/null
+++ b/ridljar/pom.ridl.xml
@@ -0,0 +1,44 @@
+
+  4.0.0
+  org.libreoffice
+  ridl
+  @version@
+  jar
+  LibreOffice - Types for the Java Uno typesystem
+  Types for the Java Uno typesystem
+  https://www.libreoffice.org
+
+  
+
+  Mozilla Public License, Version 2.0
+  https://www.mozilla.org/en-US/MPL/2.0
+  repo
+
+  
+
+  
+http://cgit.freedesktop.org/libreoffice/core
+
https://gerrit.libreoffice.org/#/admin/projects/core
+  
+
+  
+
+  The Document Foundation
+
+  
+
+  
+
+  LibreOffice Development Mailing List
+

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

2016-01-11 Thread Jan-Marek Glogowski

 sw/qa/extras/uiwriter/uiwriter.cxx |   97 +
 sw/source/core/txtnode/thints.cxx  |7 +-
 2 files changed, 100 insertions(+), 4 deletions(-)

New commits:
commit 107664a977c4893a0bc02f10cd20411c330b6d94
Author: Jan-Marek Glogowski 
Date:   Wed Dec 30 01:20:23 2015 +0100

tdf#96479 workaround bookmark end pos handling...

... when inserting text into a text node.

Seems SwTextNode::InsertText doesn't handle bookmark end
positions correctly. This is just handled correctly, if it
also contains the bookmark start.

This workaround simply concats the three strings to be
inserted in advance, so we just have to call
SwTextNode::InsertText once for the whole string.

(cherry picked from commit c91024891ff10c2ae01e11a28a9aecca2f36b6c3)

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

loplugin:stringconstant

(cherry picked from commit 67d440e6bd2c895833fa22d0f9bf5dc6901723e8)

loplugin:stringconstant

(cherry picked from commit 6aa4496c789fec271dcdc7995cf62ef2dabf1f96)
Reviewed-on: https://gerrit.libreoffice.org/21077
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit e781a8273eb2938f905485c00fbaf432e517d1dc)

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

Change-Id: Iab7708b4cc4df406bdbc3a685c7410e0e797fdc4
588a9c0205e03f701b617fd1775e7f9b9b88c6b0
60ee2ccc6090c305ade4ba16d3d298866cf89c4e
Reviewed-on: https://gerrit.libreoffice.org/21137
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 9d0d1b1..e835ee2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -104,6 +104,7 @@ public:
 void testDde();
 void testTdf89954();
 void testTdf89720();
+void testTdf96479();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -146,6 +147,7 @@ public:
 CPPUNIT_TEST(testDde);
 CPPUNIT_TEST(testTdf89954);
 CPPUNIT_TEST(testTdf89720);
+CPPUNIT_TEST(testTdf96479);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1150,6 +1152,101 @@ void SwUiWriterTest::testTdf89720()
 #endif
 }
 
+void SwUiWriterTest::testTdf96479()
+{
+// We want to verify the empty input text field in the bookmark
+static const OUString emptyInputTextField =
+OUStringLiteral1() + 
OUStringLiteral1();
+
+SwDoc* pDoc = createDoc();
+SwXTextDocument *xTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(xTextDoc);
+
+// So we can clean up all references for reload
+{
+// Append bookmark
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+IDocumentMarkAccess &rIDMA = *pDoc->getIDocumentMarkAccess();
+sw::mark::IMark *pMark =
+rIDMA.makeMark(aPaM, "original", 
IDocumentMarkAccess::MarkType::BOOKMARK);
+CPPUNIT_ASSERT(!pMark->IsExpanded());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount());
+
+// Get helper objects
+uno::Reference 
xBookmarksSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+
+// Create cursor from bookmark
+uno::Reference 
xTextContent(xBookmarksSupplier->getBookmarks()->getByName("original"), 
uno::UNO_QUERY);
+uno::Reference xRange(xTextContent->getAnchor(), 
uno::UNO_QUERY);
+uno::Reference 
xCursor(xRange->getText()->createTextCursorByRange(xRange), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCursor->isCollapsed());
+
+// Remove bookmark
+xRange->getText()->removeTextContent(xTextContent);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rIDMA.getBookmarksCount());
+
+// Insert replacement bookmark
+uno::Reference 
xBookmarkNew(xFactory->createInstance("com.sun.star.text.Bookmark"), 
uno::UNO_QUERY);
+uno::Reference xBookmarkName(xBookmarkNew, 
uno::UNO_QUERY);
+xBookmarkName->setName("replacement");
+CPPUNIT_ASSERT(xCursor->isCollapsed());
+// Force bookmark expansion
+xCursor->getText()->insertString(xCursor, ".", true);
+xCursor->getText()->insertTextContent(xCursor, xBookmarkNew, true);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount());
+auto mark = *(rIDMA.getBookmarksBegin());
+CPPUNIT_ASSERT(mark->IsExpanded());
+
+// Create and insert input textfield with some content
+uno::Reference 
xTextField(xFactory->createInstance("com.sun.star.text.TextField.Input"), 
uno::UNO_QUERY);
+uno::Reference 
xCursorNew(xBookmarkNew->getAnchor()->getText()->createTextCursorByRange(xBookmarkNew->getAnchor()));
+CPPUNIT_ASSERT(!xCursorNew->isCollapsed());
+xCursorNew->getText()->insertTextContent(xCursorNew, xTextField, true);
+xBookmarkNew = 
uno::Reference(

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

2016-01-11 Thread Jan-Marek Glogowski

 sw/qa/extras/mailmerge/data/tdf92623.odt|binary
 sw/qa/extras/mailmerge/mailmerge.cxx|   51 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   10 ++-
 3 files changed, 60 insertions(+), 1 deletion(-)

New commits:
commit cce1320efa93cc42300e457b898d892ca580ddca
Author: Jan-Marek Glogowski 
Date:   Thu Dec 3 23:18:16 2015 +0100

tdf#92623 Handle StartOfContent node for copying bookmarks

For SwDoc::AppendDoc we use the StartOfContent node as the
starting copy node to prevent merging of the first node in
CopyRange and to get a 2nd node needed for CopyRange in case
of single content node documents.

This correctly counts StartOfContent as a non-copy node when
adapting the bookmark ranges for copying.

Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f
Reviewed-on: https://gerrit.libreoffice.org/20383
Tested-by: Jenkins 
Reviewed-by: BjÃ¶rn Michaelsen 
(cherry picked from commit 689962feae2054f965a7378c3408b0ccfad2bbd5)

tdf#92623 MM: add unit test

Adds the missing unit test to the bugfix.

Actually the original bug was a crash, so this just
does some test on the resulting MM document.

Change-Id: I4c9f031e57157fe5744aa8290b7503b7e1990fc7
(cherry picked from commit 480e943f0100154fa82942db092ed1f66b76ef66)
Reviewed-on: https://gerrit.libreoffice.org/21076
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit bdcafdff89836518cb94f362ca7ea4c09a82fa03)
Reviewed-on: https://gerrit.libreoffice.org/21138
Tested-by: Jenkins 

diff --git a/sw/qa/extras/mailmerge/data/tdf92623.odt 
b/sw/qa/extras/mailmerge/data/tdf92623.odt
new file mode 100644
index 000..3dea831
Binary files /dev/null and b/sw/qa/extras/mailmerge/data/tdf92623.odt differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 42d2385..92fc7c3 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -412,5 +412,56 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf90230, "empty.odt", 
"10-testing-addresses.od
 executeMailMerge();
 }
 
+DECLARE_SHELL_MAILMERGE_TEST(testTdf92623, "tdf92623.odt", 
"10-testing-addresses.ods", "testing-addresses")
+{
+// Copying bookmarks for MM was broken because of the StartOfContent node 
copy
+// copyied marks were off by one
+executeMailMerge();
+
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+IDocumentMarkAccess const *pIDMA = 
pTextDoc->GetDocShell()->GetDoc()->getIDocumentMarkAccess();
+// There is just one mark...
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pIDMA->getAllMarksCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pIDMA->getBookmarksCount());
+IDocumentMarkAccess::const_iterator_t mark = pIDMA->getAllMarksBegin();
+// and it's a TEXT_FIELDMARK
+CPPUNIT_ASSERT_EQUAL( sal_Int32(IDocumentMarkAccess::GetType( **mark )),
+  
sal_Int32(IDocumentMarkAccess::MarkType::TEXT_FIELDMARK ) );
+sal_uLong src_pos = (*mark)->GetMarkPos().nNode.GetIndex();
+
+// Get the size of the document in nodes
+SwDoc *doc = pTextDoc->GetDocShell()->GetDoc();
+sal_uLong size = doc->GetNodes().GetEndOfContent().GetIndex() - 
doc->GetNodes().GetEndOfExtras().GetIndex();
+CPPUNIT_ASSERT_EQUAL( sal_uLong(13), size );
+size -= 2; // For common start and end nodes
+
+// Iterate over all field marks in the target document and check that they
+// are positioned at a multitude of the document size
+SwXTextDocument* pMMTextDoc = dynamic_cast(mxMMComponent.get());
+CPPUNIT_ASSERT(pMMTextDoc);
+pIDMA = pMMTextDoc->GetDocShell()->GetDoc()->getIDocumentMarkAccess();
+// The target document has the duplicated amount of bookmarks
+// as the helping uno bookmark from the mail merge is left in the doc
+// TODO should be fixed!
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20), pIDMA->getAllMarksCount());
+std::set pages;
+sal_Int32 countFieldMarks = 0;
+for( mark = pIDMA->getAllMarksBegin(); mark != pIDMA->getAllMarksEnd(); 
++mark )
+{
+IDocumentMarkAccess::MarkType markType = IDocumentMarkAccess::GetType( 
**mark );
+if( markType == IDocumentMarkAccess::MarkType::TEXT_FIELDMARK )
+{
+sal_uLong pos = (*mark)->GetMarkPos().nNode.GetIndex() - src_pos;
+CPPUNIT_ASSERT_EQUAL(sal_uLong(0), pos % size);
+CPPUNIT_ASSERT(pages.insert(pos).second);
+countFieldMarks++;
+}
+else // see previous TODO
+CPPUNIT_ASSERT_EQUAL( sal_Int32(markType), 
sal_Int32(IDocumentMarkAccess::MarkType::UNO_BOOKMARK) );
+}
+CPPUNIT_ASSERT_EQUAL(sal_Int32(10), countFieldMarks);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.c

[Libreoffice-commits] core.git: vcl/android vcl/null

2016-01-11 Thread Miklos Vajna

 vcl/android/androidinst.cxx |2 +-
 vcl/null/printerinfomanager.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b948d7a9690e8b418f25a1036b22ea53e23c36a
Author: Miklos Vajna 
Date:   Mon Jan 11 10:11:38 2016 +0100

vcl: fix Android build

Change-Id: I05ce4ddb4c933eb1100e3a3410cea27520072933

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 1b46fe2..1353c44 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -15,7 +15,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 497d370..04539b3 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -19,7 +19,7 @@
 
 #include "vcl/printerinfomanager.hxx"
 
-#include "generic/gendata.hxx"
+#include "unx/gendata.hxx"
 
 using namespace psp;
 using namespace osl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Stephan Bergmann

 dbaccess/source/core/api/RowSetCache.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit cd9a016116e07e6ac08dcdd3b08b3d070469cedc
Author: Stephan Bergmann 
Date:   Mon Jan 11 10:15:07 2016 +0100

-Werror=unused-but-set-variable

Change-Id: I8d2870dc003185598977876e4ff54af74645bc90

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index f1b81a1..ca288c4 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -873,8 +873,6 @@ void ORowSetCache::moveWindow()
 return;
 }
 
-bool bRet = true;
-
 sal_Int32 nDiff = (m_nFetchSize - 1) / 2;
 sal_Int32 nNewStartPos  = (m_nPosition - nDiff) - 1; //m_nPosition is 
1-based, but m_nStartPos is 0-based
 sal_Int32 nNewEndPos= nNewStartPos + m_nFetchSize;
@@ -963,7 +961,7 @@ void ORowSetCache::moveWindow()
 }
 else
 {// no rows can be reused so fill again
-bRet = reFillMatrix(nNewStartPos,nNewEndPos);
+reFillMatrix(nNewStartPos,nNewEndPos);
 }
 }
 
@@ -1076,7 +1074,7 @@ void ORowSetCache::moveWindow()
 }
 }
 else // no rows can be reused so fill again
-bRet = reFillMatrix(nNewStartPos,nNewEndPos);
+reFillMatrix(nNewStartPos,nNewEndPos);
 }
 
 if(!m_bRowCountFinal)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: license statement

2016-01-11 Thread jan iversen

Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

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

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

rgds
Jan Iversen.

Sent from my iPad, please excuse any misspellings___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Gerrit patch set for a regression of Lo 5.1 wrt Lo 5.0

2016-01-11 Thread Giuseppe Castagno


Hi all,

it seems that LO 5.1 can no longer save to Google Drive.

See:

the Windows test only.

Linux test is not possible due to:


Gerrit patch for master branch at:


Thanks,

--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/vcl vcl/CppunitTest_vcl_bitmap_test.mk vcl/Library_vcl.mk vcl/qa vcl/source

2016-01-11 Thread Stephan Bergmann

 include/vcl/BitmapFilterStackBlur.hxx   |   32 -
 vcl/CppunitTest_vcl_bitmap_test.mk  |1 
 vcl/Library_vcl.mk  |1 
 vcl/qa/cppunit/BitmapFilterTest.cxx |  175 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx |  581 
 5 files changed, 790 deletions(-)

New commits:
commit da40d2558e3de30914f4c181cceb66937c6f1124
Author: Stephan Bergmann 
Date:   Mon Jan 11 10:42:23 2016 +0100

Remove BitmapFilterStackBlur, which is unused...

...ever since it got introduced with 
28c61871e876e6a2cac47439f768504b1a4c94a0
"vcl: stack blur implementation + basic test & performance test"

Change-Id: I78672cf74c24930df92121baecb9886df4382036

diff --git a/include/vcl/BitmapFilterStackBlur.hxx 
b/include/vcl/BitmapFilterStackBlur.hxx
deleted file mode 100644
index 5b2b002..000
--- a/include/vcl/BitmapFilterStackBlur.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- */
-
-#ifndef INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
-#define INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
-
-#include 
-#include 
-#include 
-
-class VCL_DLLPUBLIC BitmapFilterStackBlur : BitmapFilter
-{
-sal_Int32 mnRadius;
-bool mbExtend;
-
-public:
-BitmapFilterStackBlur(sal_Int32 nRadius, bool bExtend = true);
-virtual ~BitmapFilterStackBlur();
-
-bool filter(Bitmap& rBitmap) override;
-};
-
-#endif // INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk 
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 290d167..a65ddb3 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,vcl_bitmap_test))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
 vcl/qa/cppunit/BitmapTest \
-vcl/qa/cppunit/BitmapFilterTest \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f757232..961bb05 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -317,7 +317,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/bitmap/bitmapscalesuper \
 vcl/source/bitmap/BitmapScaleConvolution \
 vcl/source/bitmap/BitmapSymmetryCheck \
-vcl/source/bitmap/BitmapFilterStackBlur \
 vcl/source/bitmap/BitmapProcessor \
 vcl/source/bitmap/BitmapTools \
 vcl/source/bitmap/checksum \
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx 
b/vcl/qa/cppunit/BitmapFilterTest.cxx
deleted file mode 100644
index ade5acb..000
--- a/vcl/qa/cppunit/BitmapFilterTest.cxx
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include "BitmapSymmetryCheck.hxx"
-
-#include 
-
-namespace
-{
-
-const bool constWriteResultBitmap(false);
-const bool constEnablePerformanceTest(false);
-
-class BitmapFilterTest : public CppUnit::TestFixture
-{
-
-void testBlurCorrectness();
-void testPerformance();
-
-CPPUNIT_TEST_SUITE(BitmapFilterTest);
-CPPUNIT_TEST(testBlurCorrectness);
-CPPUNIT_TEST(testPerformance);
-CPPUNIT_TEST_SUITE_END();
-};
-
-void BitmapFilterTest::testBlurCorrectness()
-{
-// Setup test bitmap
-Size aSize(41, 31);
-Bitmap aBitmap24Bit(aSize, 24);
-
-sal_uLong nScanlineFormat = 0;
-sal_uInt16 nBPP = aBitmap24Bit.GetBitCount();
-
-{
-long aMargin1 = 1;
-long aMargin2 = 3;
-Bitmap::ScopedWriteAccess aWriteAccess(aBitmap24Bit);
-nScanlineFormat = aWriteAccess->GetScanlineFormat();
-aWriteAccess->Erase(COL_WHITE);
-aWriteAccess->SetLineColor(COL_BLACK);
-
-Rectangle aRectangle1(
-aMargin1,
-aMargin1,
-aSize.Width() - 1 - aMargin1,
-aSize.Height() - 1 - aMargin1);
-
-Rectangle aRectangle2(
-aMargin2,
-aMargin2,
-aSize.Width() - 1 - aMargin2,
-aSize.Height() - 1 - aMargin2);
-
-Rectangle aRectangle3(
-aSize.Width()  / 2,
-aSize.Height() / 2,
-aSize.Width()  / 2,
-aS

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

2016-01-11 Thread Ras-al-Ghul

 vcl/source/window/dialog.cxx |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 9a562c6f8075d55b92150ae70a595da69ab9fac8
Author: Ras-al-Ghul 
Date:   Sun Jan 10 03:59:15 2016 +0530

tdf#96888 Kill internal vcl dog-tags ..

Added an assert statement and corrected a glaring error regarding clear() 
usage

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

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 066ac97..e8d8d47 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -865,10 +865,6 @@ short Dialog::Execute()
 
 VclPtr xWindow = this;
 
-#ifdef DBG_UTIL
-VclPtr xDialogParent = mpDialogParent;
-#endif
-
 // Yield util EndDialog is called or dialog gets destroyed
 // (the latter should not happen, but better safe than sorry
 while ( !xWindow->IsDisposed() && mbInExecute )
@@ -877,13 +873,7 @@ short Dialog::Execute()
 ImplEndExecuteModal();
 
 #ifdef DBG_UTIL
-if( xDialogParent  )
-{
-if( ! xDialogParent->IsDisposed() )
-xDialogParent.clear();
-else
-OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in 
Execute()" );
-}
+assert (!mpDialogParent || !mpDialogParent->IsDisposed());
 #endif
 if ( !xWindow->IsDisposed() )
 xWindow.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Michael Meeks

 vcl/source/window/status.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3f5a9ca46efc801f79cdc00a3583646936bec689
Author: Michael Meeks 
Date:   Sat Jan 9 23:32:00 2016 +

tdf#96655 - clear non-offscreen status bar controls before render.

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

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index ffd3541..9a45ee6 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -698,7 +698,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
 }
 }
 
-void StatusBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void StatusBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect)
 {
 if (mbFormat)
 ImplFormat();
@@ -737,10 +737,11 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, 
const Rectangle&)
 if( OpenGLWrapper::isVCLOpenGLEnabled() )
 bOffscreen = false;
 
+if (!bOffscreen)
+rRenderContext.Erase(rRect);
+
 for (sal_uInt16 i = 0; i < nItemCount; i++)
-{
 ImplDrawItem(rRenderContext, bOffscreen, i, true, true);
-}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - basic/source compilerplugins/clang desktop/source editeng/source extensions/source

2016-01-11 Thread Noel Grandin

 basic/source/sbx/sbxdec.cxx   |1 
 compilerplugins/clang/unusedmethods.py|2 -
 desktop/source/deployment/dp_persmap.cxx  |6 
+--
 desktop/source/deployment/gui/dp_gui_dialog2.cxx  |   18 
+++---
 desktop/source/deployment/gui/dp_gui_dialog2.hxx  |8 
++--
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx|9 
++---
 desktop/source/deployment/gui/dp_gui_theextmgr.hxx|2 -
 desktop/source/deployment/inc/dp_persmap.h|2 -
 desktop/source/deployment/registry/component/dp_component.cxx |   12 
++
 desktop/source/deployment/registry/configuration/dp_configuration.cxx |7 
+--
 desktop/source/migration/services/basicmigration.cxx  |8 
+---
 desktop/source/migration/services/basicmigration.hxx  |2 -
 desktop/source/migration/services/oo3extensionmigration.cxx   |8 
+---
 desktop/source/migration/services/oo3extensionmigration.hxx   |2 -
 desktop/source/migration/services/wordbookmigration.cxx   |8 
+---
 desktop/source/migration/services/wordbookmigration.hxx   |2 -
 editeng/source/editeng/editdoc.cxx|   13 
---
 editeng/source/editeng/editdoc.hxx|2 -
 editeng/source/editeng/impedit.hxx|2 -
 editeng/source/editeng/impedit2.cxx   |4 --
 editeng/source/editeng/textconv.cxx   |3 -
 editeng/source/editeng/textconv.hxx   |2 -
 extensions/source/abpilot/datasourcehandling.cxx  |3 -
 extensions/source/abpilot/datasourcehandling.hxx  |2 -
 extensions/source/propctrlr/pcrcommon.hxx |3 -
 extensions/source/propctrlr/propertyeditor.cxx|8 
+---
 extensions/source/propctrlr/propertyeditor.hxx|2 -
 extensions/source/propctrlr/standardcontrol.cxx   |4 --
 extensions/source/propctrlr/standardcontrol.hxx   |2 -
 extensions/source/propctrlr/unourl.hxx|3 -
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx  |7 
+--
 extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx  |2 -
 32 files changed, 53 insertions(+), 106 deletions(-)

New commits:
commit 9a64d7f8ddbd27020c1e9eb3866efbfaa62c8be5
Author: Noel Grandin 
Date:   Mon Jan 11 11:54:23 2016 +0200

fix windows build

Change-Id: Ie00d2dd3fbf6ff498c652249797f8d01acef8a97

diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 8938e2f..8a956c8 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -387,7 +387,6 @@ void SbxDecimal::getString( OUString& rString )
 
 SysFreeString( aBStr );
 }
-return bRet;
 #else
 (void)rString;
 #endif
commit 1ea49b5baeb415038129b4f1e0b5a331b32365d5
Author: Noel Grandin 
Date:   Mon Jan 11 11:54:13 2016 +0200

loplugin:unusedmethods unused return value in extensions

Change-Id: I449ecdb734e796813384a5d015e9ecabe28079eb

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index baf72de..fddb247 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2940,19 +2940,6 @@ bool CharAttribList::HasBoundingAttrib( sal_Int32 nBound 
) const
 return false;
 }
 
-const EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, 
sal_Int32 nPos ) const
-{
-if ( !bHasEmptyAttribs )
-return nullptr;
-
-for (const std::unique_ptr& rAttr : aAttribs)
-{
-if (rAttr->GetStart() == nPos && rAttr->GetEnd() == nPos && 
rAttr->Which() == nWhich)
-return rAttr.get();
-}
-return nullptr;
-}
-
 EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 
nPos )
 {
 if ( !bHasEmptyAttribs )
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index ebdfb09..9fca927 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -201,7 +201,6 @@ public:
 const EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) 
const;
 EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos );
 const EditCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_Int32 
nFromPos ) const;
-const EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) 
const;
 EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos );
 const EditCharAttrib* FindFeature( sal_Int32 nPos ) const;
 
@@ -262,7 +261,6 @@ public:
 void

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

2016-01-11 Thread Michael Meeks

 vcl/inc/openglgdiimpl.hxx |7 ++-
 vcl/opengl/gdiimpl.cxx|   45 +++--
 vcl/workben/vcldemo.cxx   |4 +++-
 3 files changed, 40 insertions(+), 16 deletions(-)

New commits:
commit 1b2a60dbde98034125aa30551c12bcf0d1c420b8
Author: Michael Meeks 
Date:   Fri Jan 8 22:33:11 2016 +

tdf#96919 - vcl opengl: implement missing XOR mode.

Also revert "tdf#96257: Silly work-around to produce same result ..."
from commit ec8bc265050d86a749140c353360a78cce4e3fce.

XOR rendering (it turns out) behaves oddly, and not for all operations.

Change-Id: Ie07d988bbf7fed10fb5625ac547a01a306b05319
Reviewed-on: https://gerrit.libreoffice.org/21282
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/21288
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 14beab5..a178d18 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -80,6 +80,8 @@ protected:
 bool mbUseScissor;
 bool mbUseStencil;
 
+bool mbXORMode;
+
 /**
  * All rendering happens to this off-screen texture. For
  * non-virtual devices, ie. windows - we will blit it and
@@ -152,8 +154,11 @@ public:
  */
 bool IsOffscreen() const { return mpProvider == nullptr || 
mpProvider->IsOffScreen(); }
 
+/// Oddly not all operations obey the XOR option.
+enum XOROption { IGNORE_XOR, IMPLEMENT_XOR };
+
 // operations to do before painting
-void PreDraw();
+void PreDraw(XOROption eOpt = IGNORE_XOR);
 
 // operations to do after painting
 void PostDraw();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 8c31f5e..7304a1a 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -68,6 +68,7 @@ OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& 
rParent, SalGeometryPr
 , mpFlush(new OpenGLFlushIdle(this))
 , mbUseScissor(false)
 , mbUseStencil(false)
+, mbXORMode(false)
 , mnLineColor(SALCOLOR_NONE)
 , mnFillColor(SALCOLOR_NONE)
 #ifdef DBG_UTIL
@@ -176,7 +177,7 @@ void OpenGLSalGraphicsImpl::DeInit()
 mpContext.clear();
 }
 
-void OpenGLSalGraphicsImpl::PreDraw()
+void OpenGLSalGraphicsImpl::PreDraw(XOROption eOpt)
 {
 OpenGLZone::enter();
 
@@ -196,13 +197,27 @@ void OpenGLSalGraphicsImpl::PreDraw()
 
 glViewport( 0, 0, GetWidth(), GetHeight() );
 CHECK_GL_ERROR();
-ImplInitClipRegion();
 
+ImplInitClipRegion();
 CHECK_GL_ERROR();
+
+if (eOpt == IMPLEMENT_XOR && mbXORMode)
+{
+glEnable(GL_COLOR_LOGIC_OP);
+CHECK_GL_ERROR();
+
+glLogicOp(GL_XOR);
+}
 }
 
 void OpenGLSalGraphicsImpl::PostDraw()
 {
+if (mbXORMode)
+{
+glDisable(GL_COLOR_LOGIC_OP);
+CHECK_GL_ERROR();
+}
+
 if( mbUseScissor )
 {
 glDisable( GL_SCISSOR_TEST );
@@ -404,8 +419,9 @@ void OpenGLSalGraphicsImpl::SetFillColor( SalColor 
nSalColor )
 }
 
 // enable/disable XOR drawing
-void OpenGLSalGraphicsImpl::SetXORMode( bool /*bSet*/, bool /*bInvertOnly*/ )
+void OpenGLSalGraphicsImpl::SetXORMode( bool bSet, bool )
 {
+mbXORMode = bSet;
 }
 
 // set line color for raster operations
@@ -503,6 +519,7 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor, 
sal_uInt8 nTransparency )
 #endif
 mProgramSolidColor = nColor;
 mProgramSolidTransparency = nTransparency / 100.0;
+
 return true;
 }
 
@@ -1331,7 +1348,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
 VCL_GL_INFO( "::drawPixel" );
 if( mnLineColor != SALCOLOR_NONE )
 {
-PreDraw();
+PreDraw( XOROption::IMPLEMENT_XOR );
 if( UseSolid( mnLineColor ) )
 DrawPoint( nX, nY );
 PostDraw();
@@ -1343,7 +1360,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, 
SalColor nSalColor )
 VCL_GL_INFO( "::drawPixel" );
 if( nSalColor != SALCOLOR_NONE )
 {
-PreDraw();
+PreDraw( XOROption::IMPLEMENT_XOR );
 if( UseSolid( nSalColor ) )
 DrawPoint( nX, nY );
 PostDraw();
@@ -1355,7 +1372,7 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, 
long nX2, long nY2 )
 VCL_GL_INFO( "::drawLine" );
 if( mnLineColor != SALCOLOR_NONE )
 {
-PreDraw();
+PreDraw( XOROption::IMPLEMENT_XOR );
 if( UseSolidAA( mnLineColor ) )
 DrawLineAA( nX1, nY1, nX2, nY2 );
 PostDraw();
@@ -1365,7 +1382,7 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, 
long nX2, long nY2 )
 void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long 
nHeight )
 {
 VCL_GL_INFO( "::drawRect" );
-PreDraw();
+PreDraw( XOROption::IMPLEMENT_XOR );
 
 if( UseSolid( mnFillColor ) )
 DrawRect( nX, nY, nWidth, nHeight );
@@ -1403,7 +1420,7 @@ void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 
nPoints, cons

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

2016-01-11 Thread Michael Meeks

 vcl/opengl/salbmp.cxx |   24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

New commits:
commit c332ed4794dc0ae818416b36aa5295a9dd34c9c6
Author: Michael Meeks 
Date:   Sat Jan 9 21:25:12 2016 +

tdf#96550 - vcl opengl - fix BGR/RGB swap for some 8-bit icons.

Change-Id: Ic71b8a94cabc392e7b83df70c1691de8f4c12b43
Reviewed-on: https://gerrit.libreoffice.org/21295
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 9e59e23..03497dc 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -472,13 +472,25 @@ GLuint OpenGLSalBitmap::CreateTexture()
 pSrcFormat->StartLine( pSrcData );
 
 sal_uInt32 nX = mnBufWidth;
-while( nX-- )
+if (nFormat == GL_BGR)
 {
-const BitmapColor& c = pSrcFormat->ReadPixel();
-
-*pDstData++ = c.GetRed();
-*pDstData++ = c.GetGreen();
-*pDstData++ = c.GetBlue();
+while( nX-- )
+{
+const BitmapColor& c = pSrcFormat->ReadPixel();
+*pDstData++ = c.GetBlue();
+*pDstData++ = c.GetGreen();
+*pDstData++ = c.GetRed();
+}
+}
+else // RGB
+{
+while( nX-- )
+{
+const BitmapColor& c = pSrcFormat->ReadPixel();
+*pDstData++ = c.GetRed();
+*pDstData++ = c.GetGreen();
+*pDstData++ = c.GetBlue();
+}
 }
 
 pSrcData += mnBytesPerRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Michael Meeks

 vcl/opengl/gdiimpl.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit dd70c25bda8f7ad8da6e68b6e88fd222cab1a10f
Author: Michael Meeks 
Date:   Sat Jan 9 12:13:15 2016 +

tdf#96657 - vcl opengl: implement invert: Track Frame.

Change-Id: I422ea8cfb8a81cca36203d496b92e15ea5b449d2
Reviewed-on: https://gerrit.libreoffice.org/21289
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 7304a1a..b7276ed 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -576,6 +576,7 @@ bool OpenGLSalGraphicsImpl::UseInvert( SalInvert nFlags )
 if( ( nFlags & SAL_INVERT_50 ) ||
 ( nFlags & SAL_INVERT_TRACKFRAME ) )
 {
+// FIXME: Trackframe really should be 2 pix. on/off stipple.
 if( !UseInvert50() )
 return false;
 mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR,
@@ -1752,7 +1753,17 @@ void OpenGLSalGraphicsImpl::invert(
 PreDraw();
 
 if( UseInvert( nFlags ) )
-DrawRect( nX, nY, nWidth, nHeight );
+{
+if( nFlags & SAL_INVERT_TRACKFRAME )
+{ // FIXME: could be more efficient.
+DrawRect( nX, nY, nWidth, 1 );
+DrawRect( nX, nY + nHeight, nWidth, 1 );
+DrawRect( nX, nY, 1, nHeight );
+DrawRect( nX + nWidth, nY, 1, nHeight );
+}
+else
+DrawRect( nX, nY, nWidth, nHeight );
+}
 
 PostDraw();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/source

2016-01-11 Thread Pranav Kant

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

New commits:
commit 2bb2c450a741a539be69494b5308428d07c56adf
Author: Pranav Kant 
Date:   Sun Dec 13 10:48:45 2015 +0530

lokdocview: Remove an easy FIXME

Change-Id: I8305f3eb45330f457089ca0524a0df004410f59c
Reviewed-on: https://gerrit.libreoffice.org/20774
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 244aad533b0fd714136f4f62b5a07fc136c740f0)
Reviewed-on: https://gerrit.libreoffice.org/21263
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 3d01a62..e6356d8 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2430,8 +2430,7 @@ lok_doc_view_open_document_finish (LOKDocView* pDocView, 
GAsyncResult* res, GErr
 GTask* task = G_TASK(res);
 
 g_return_val_if_fail(g_task_is_valid(res, pDocView), false);
-//FIXME: make source_tag work
-//g_return_val_if_fail(g_task_get_source_tag(task) == 
lok_doc_view_open_document, NULL);
+g_return_val_if_fail(g_task_get_source_tag(task) == 
lok_doc_view_open_document, false);
 g_return_val_if_fail(error == nullptr || *error == nullptr, false);
 
 return g_task_propagate_boolean(task, error);
@@ -2456,6 +2455,7 @@ lok_doc_view_open_document (LOKDocView* pDocView,
 if (pRenderingArguments)
 priv->m_aRenderingArguments = pRenderingArguments;
 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
+g_task_set_source_tag(task, 
reinterpret_cast(lok_doc_view_open_document));
 
 g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
 if (error != nullptr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/source

2016-01-11 Thread Pranav Kant

 libreofficekit/source/gtk/lokdocview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0478825ba51d390486bfbecb410bf9aaa3a3ff59
Author: Pranav Kant 
Date:   Tue Dec 15 00:23:46 2015 +0530

lokdocview: Superfluous *_set_zoom() call on widget initialization

G_PARAM_CONSTRUCT implies that parameter will be set upon widget
initialization which means calling lok_doc_view_set_zoom() while
document still points to null.

Change-Id: Ib576ac3b32c2349be2b2df6067ae79a056a03028
Reviewed-on: https://gerrit.libreoffice.org/20775
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit a2682e4b081a9a8c6814db768e4ee9e5390907ae)
Reviewed-on: https://gerrit.libreoffice.org/21264
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index e6356d8..16e13e1 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -760,6 +760,7 @@ static gboolean postDocumentLoad(gpointer pData)
 nDocumentHeightPixels);
 gtk_widget_set_can_focus(GTK_WIDGET(pLOKDocView), TRUE);
 gtk_widget_grab_focus(GTK_WIDGET(pLOKDocView));
+lok_doc_view_set_zoom(pLOKDocView, 1.0);
 
 return G_SOURCE_REMOVE;
 }
@@ -2143,7 +2144,6 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  "The current zoom level of the content",
  0, 5.0, 1.0,
  static_cast(G_PARAM_READWRITE |
-  G_PARAM_CONSTRUCT |
   
G_PARAM_STATIC_STRINGS)));
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/LibreOfficeKit

2016-01-11 Thread Pranav Kant

 include/LibreOfficeKit/LibreOfficeKitGtk.h |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 2f5643d7fa1009155e900a89918d5cee3265c137
Author: Pranav Kant 
Date:   Thu Dec 17 20:33:06 2015 +0530

lokdocview: Added some missing comments/annotations

Change-Id: I2f62bae37719ce96677a5ca6ffd93c8edb325a6a
Reviewed-on: https://gerrit.libreoffice.org/20777
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 9c8c3acffa304e2d85dcbbdb5bf9decc9b255b13)
Reviewed-on: https://gerrit.libreoffice.org/21266
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index c3cba8f..62d2e7f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -123,12 +123,17 @@ gfloat lok_doc_view_get_zoom  
 (LOKDocView*
 /**
  * lok_doc_view_get_parts:
  * @pDocView: The #LOKDocView instance
+ *
+ * Returns: Part refers to either individual sheets in a Calc, or slides in 
Impress,
+ * and has no relevance for Writer.
  */
 gint   lok_doc_view_get_parts  
(LOKDocView* pDocView);
 
 /**
  * lok_doc_view_get_part:
  * @pDocView: The #LOKDocView instance
+ *
+ * Returns: Current part number of the document
  */
 gint   lok_doc_view_get_part   
(LOKDocView* pDocView);
 
@@ -144,6 +149,8 @@ void   lok_doc_view_set_part
   (LOKDocView*
  * lok_doc_view_get_part_name:
  * @pDocView: The #LOKDocView instance
  * @nPart:
+ *
+ * Returns: Get current part name of loaded document
  */
 gchar* lok_doc_view_get_part_name  
(LOKDocView* pDocView,
 int nPart);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/LibreOfficeKit libreofficekit/source

2016-01-11 Thread Pranav Kant

 include/LibreOfficeKit/LibreOfficeKitGtk.h |   12 ++--
 libreofficekit/source/gtk/lokdocview.cxx   |   12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 0886f49224064a259ed6615961f420ab7b6fc3ef
Author: Pranav Kant 
Date:   Thu Dec 17 20:35:23 2015 +0530

lokdocview: Use GLib basic types

Change-Id: I07add7b9dcb1dc53d7ed61ff71545489de3be155
Reviewed-on: https://gerrit.libreoffice.org/20778
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit b902432b431d01634c1f56e4758ec236a999650d)
Reviewed-on: https://gerrit.libreoffice.org/21265
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 903a742..c3cba8f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -118,19 +118,19 @@ void   lok_doc_view_set_zoom  
 (LOKDocView*
  *
  * Returns: The current zoom factor value in float for pDocView
  */
-float  lok_doc_view_get_zoom   
(LOKDocView* pDocView);
+gfloat lok_doc_view_get_zoom   
(LOKDocView* pDocView);
 
 /**
  * lok_doc_view_get_parts:
  * @pDocView: The #LOKDocView instance
  */
-intlok_doc_view_get_parts  
(LOKDocView* pDocView);
+gint   lok_doc_view_get_parts  
(LOKDocView* pDocView);
 
 /**
  * lok_doc_view_get_part:
  * @pDocView: The #LOKDocView instance
  */
-intlok_doc_view_get_part   
(LOKDocView* pDocView);
+gint   lok_doc_view_get_part   
(LOKDocView* pDocView);
 
 /**
  * lok_doc_view_set_part:
@@ -145,7 +145,7 @@ void   lok_doc_view_set_part
   (LOKDocView*
  * @pDocView: The #LOKDocView instance
  * @nPart:
  */
-char*  lok_doc_view_get_part_name  
(LOKDocView* pDocView,
+gchar* lok_doc_view_get_part_name  
(LOKDocView* pDocView,
 int nPart);
 
 /**
@@ -272,7 +272,7 @@ gbooleanlok_doc_view_paste  
   (LOKDocView*
  *
  * Returns: The corresponding value in twips
  */
-float  lok_doc_view_pixel_to_twip  
(LOKDocView* pDocView,
+gfloat lok_doc_view_pixel_to_twip  
(LOKDocView* pDocView,
 float 
fInput);
 
 /**
@@ -284,7 +284,7 @@ float  lok_doc_view_pixel_to_twip   
   (LOKDocView*
  *
  * Returns: The corresponding value in pixels
  */
-float  lok_doc_view_twip_to_pixel  
(LOKDocView* pDocView,
+gfloat lok_doc_view_twip_to_pixel  
(LOKDocView* pDocView,
 float 
fInput);
 
 G_END_DECLS
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 16e13e1..eb20aab 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2509,14 +2509,14 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float 
fZoom)
 g_object_unref(task);
 }
 
-SAL_DLLPUBLIC_EXPORT float
+SAL_DLLPUBLIC_EXPORT gfloat
 lok_doc_view_get_zoom (LOKDocView* pDocView)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
 return priv->m_fZoom;
 }
 
-SAL_DLLPUBLIC_EXPORT int
+SAL_DLLPUBLIC_EXPORT gint
 lok_doc_view_get_parts (LOKDocView* pDocView)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
@@ -2524,7 +2524,7 @@ lok_doc_view_get_parts (LOKDocView* pDocView)
 return priv->m_pDocument->pClass->getParts( priv->m_pDocument );
 }
 
-SAL_DLLPUBLIC_EXPORT int
+SAL_DLLPUBLIC_EXPORT gint
 lok_doc_view_get_part (LOKDocView* pDocView)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
@@ -2552,7 +2552,7 @@ lok_doc_view_set_part (LOKDocView* pDocView, int nPart)
 g_object_unref(task);
 }
 
-SAL_DLLPUBLIC_EXPORT char*
+SAL_DLLPUBLIC_EXPORT gchar*
 lok_doc_view_get_part_name (LOKDocView* pDocView, int nPart)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
@@ -2720,14 +2720,14 @@ lok_doc_view_paste (LOKDocView* pDocView,
 return ret;
 }
 
-SAL_DLLPUBLIC_EXPORT float
+SAL_DLLPUBLIC_EXPORT gfloat
 lok_doc_view_pixel_to_twip (LOKDocView* pDocView, float fInput)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
 return pixelToTwip(fInput, priv->m_fZoom);
 }
 
-SAL_DLLPUBLIC_EXPORT float
+SAL_DLLPUBLIC_EXPORT gfloat
 lok_doc_view_twip_to_pixel (LOKDocView* pDocView, float fInput)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
___
Libreoffice-commits mailing

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/LibreOfficeKit libreofficekit/qa libreofficekit/source

2016-01-11 Thread Pranav Kant

 include/LibreOfficeKit/LibreOfficeKitGtk.h  |   10 +++--
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |3 +
 libreofficekit/source/gtk/lokdocview.cxx|   35 ++--
 3 files changed, 42 insertions(+), 6 deletions(-)

New commits:
commit dd6006be974ce808f276c550d32f1bc01582aaf3
Author: Pranav Kant 
Date:   Thu Dec 17 21:03:47 2015 +0530

lokdocview: Return if no document is set

For example, when document has been destroyed using
lok_doc_view_destroy_document()

Change-Id: I531b85018ffa25bcf88fb101c912b9f11b489a97
Reviewed-on: https://gerrit.libreoffice.org/20779
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit df4a196b8f1e97d8a45d1d517942e01bd13182e7)
Reviewed-on: https://gerrit.libreoffice.org/21267
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 62d2e7f..911bbdf 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -125,7 +125,7 @@ gfloat lok_doc_view_get_zoom
   (LOKDocView*
  * @pDocView: The #LOKDocView instance
  *
  * Returns: Part refers to either individual sheets in a Calc, or slides in 
Impress,
- * and has no relevance for Writer.
+ * and has no relevance for Writer. Returns -1 if no document is set currently.
  */
 gint   lok_doc_view_get_parts  
(LOKDocView* pDocView);
 
@@ -133,7 +133,7 @@ gint   lok_doc_view_get_parts   
   (LOKDocView*
  * lok_doc_view_get_part:
  * @pDocView: The #LOKDocView instance
  *
- * Returns: Current part number of the document
+ * Returns: Current part number of the document. Returns -1 if no document is 
set currently.
  */
 gint   lok_doc_view_get_part   
(LOKDocView* pDocView);
 
@@ -150,7 +150,8 @@ void   lok_doc_view_set_part
   (LOKDocView*
  * @pDocView: The #LOKDocView instance
  * @nPart:
  *
- * Returns: Get current part name of loaded document
+ * Returns: Get current part name of loaded document. Returns null if no
+ * document is set, or document has been destroyed using 
lok_doc_view_destroy_document.
  */
 gchar* lok_doc_view_get_part_name  
(LOKDocView* pDocView,
 int nPart);
@@ -248,7 +249,8 @@ void   lok_doc_view_highlight_all   
   (LOKDocView*
  * @pUsedMimeType: (out): output parameter to inform about the determined 
format
  * (suggested or plain text).
  *
- * Returns: Selected text. The caller must free the returned buffer after use.
+ * Returns: Selected text. The caller must free the returned buffer after
+ * use. Returns null if no document is set.
  */
 gchar*  lok_doc_view_copy_selection
(LOKDocView* pDocView,
 const 
gchar* pMimeType,
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index b4dbe16..fb886ef 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -549,7 +549,10 @@ static void doCopy(GtkWidget* pButton, gpointer /*pItem*/)
 TiledWindow& rWindow = lcl_getTiledWindow(pButton);
 LOKDocView* pLOKDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
 char* pUsedFormat = nullptr;
+// TODO: Should check `text-selection` signal before trying to copy
 char* pSelection = lok_doc_view_copy_selection(pLOKDocView, "text/html", 
&pUsedFormat);
+if (!pSelection)
+return;
 
 GtkClipboard* pClipboard = 
gtk_clipboard_get_for_display(gtk_widget_get_display(rWindow.m_pDocView), 
GDK_SELECTION_CLIPBOARD);
 std::string aUsedFormat(pUsedFormat);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index eb20aab..ae8e52a 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -342,6 +342,9 @@ doSearch(LOKDocView* pDocView, const char* pText, bool 
bBackwards, bool highligh
 cairo_rectangle_int_t cairoVisRect;
 int x, y;
 
+if (!priv->m_pDocument)
+return;
+
 cairo_region_get_rectangle(cairoVisRegion, 0, &cairoVisRect);
 x = pixelToTwip (cairoVisRect.x, priv->m_fZoom);
 y = pixelToTwip (cairoVisRect.y, priv->m_fZoom);
@@ -1630,8 +1633,6 @@ setClientZoomInThread(gpointer data)
 LOKDocViewPrivate& priv = getPrivate(pDocView);
 LOEvent* pLOEvent = static_cast(g_task_get_task_data(task));
 
-if (!priv->m_pDocument)
-return;
 priv->m_pDocument->pClass->setClientZoom(priv->m_pDocument,
  pLOEvent->m_nTilePixelWidth,

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

2016-01-11 Thread Caolán McNamara

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

New commits:
commit 699b5e361d1f75b1414a351dfe4d05d88e2b49e2
Author: CaolÃ¡n McNamara 
Date:   Sat Dec 19 15:09:10 2015 +

coverity#1343632 Resource leak

Change-Id: I79bf35a4c1a2f0463abc202f6c2b104ffdd5139c
(cherry picked from commit 5b05a3fa2d6873c1046a959c545db133b1974e2c)
Reviewed-on: https://gerrit.libreoffice.org/21269
Reviewed-by: David Tardon 
Tested-by: Jenkins 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 6ce7344..918f292 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2579,13 +2579,13 @@ lok_doc_view_set_partmode(LOKDocView* pDocView,
   int nPartMode)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
+if (!priv->m_pDocument)
+return;
+
 GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
 LOEvent* pLOEvent = new LOEvent(LOK_SET_PARTMODE);
 GError* error = nullptr;
 
-if (!priv->m_pDocument)
-return;
-
 pLOEvent->m_nPartMode = nPartMode;
 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
 
commit 195866b16f044bc792526145b739602166ca7276
Author: CaolÃ¡n McNamara 
Date:   Sat Dec 19 15:08:01 2015 +

coverity#1343631 Resource leak

Change-Id: Ic5d7c88ae4080c2e103fb691c2e326a9e239aa12
(cherry picked from commit 169298fa73d2c5429d1960db6049a4ed15653b4f)
Reviewed-on: https://gerrit.libreoffice.org/21268
Reviewed-by: David Tardon 
Tested-by: Jenkins 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index ae8e52a..6ce7344 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2649,13 +2649,13 @@ lok_doc_view_set_edit(LOKDocView* pDocView,
   gboolean bEdit)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
+if (!priv->m_pDocument)
+return;
+
 GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
 LOEvent* pLOEvent = new LOEvent(LOK_SET_EDIT);
 GError* error = nullptr;
 
-if (!priv->m_pDocument)
-return;
-
 pLOEvent->m_bEdit = bEdit;
 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Caolán McNamara

 libreofficekit/source/gtk/lokdocview.cxx |   14 ++
 libreofficekit/source/gtk/tilebuffer.hxx |4 
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit d753e9e41283ca1e0d77001ec1174426451dd7fe
Author: CaolÃ¡n McNamara 
Date:   Mon Dec 21 09:11:16 2015 +

coverity#1315075 Uninitialized scalar field

Change-Id: I003839589354f02f8064b6a6af6174d2793b9b3a
(cherry picked from commit 92305c3c41d120b868e0821221a583697868ad6d)
Reviewed-on: https://gerrit.libreoffice.org/21271
Reviewed-by: David Tardon 
Tested-by: Jenkins 

diff --git a/libreofficekit/source/gtk/tilebuffer.hxx 
b/libreofficekit/source/gtk/tilebuffer.hxx
index 96100d7..cdd3e70 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -267,6 +267,10 @@ struct LOEvent
 , m_nSetGraphicSelectionType(0)
 , m_nSetGraphicSelectionX(0)
 , m_nSetGraphicSelectionY(0)
+, m_nTilePixelWidth(0)
+, m_nTilePixelHeight(0)
+, m_nTileTwipWidth(0)
+, m_nTileTwipHeight(0)
 {
 }
 
commit af32996eb55008b9787516a280a237b61a05ca05
Author: CaolÃ¡n McNamara 
Date:   Sat Dec 19 15:11:03 2015 +

coverity#1343633 Resource leak

Change-Id: I2384091557c2a3b061e2c60118309f35b65b45d6
(cherry picked from commit 746da6b7fb3829e1ca23a4b8dfec6c502bac681c)
Reviewed-on: https://gerrit.libreoffice.org/21270
Reviewed-by: David Tardon 
Tested-by: Jenkins 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 918f292..426773c 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -335,6 +335,9 @@ static void
 doSearch(LOKDocView* pDocView, const char* pText, bool bBackwards, bool 
highlightAll)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
+if (!priv->m_pDocument)
+return;
+
 boost::property_tree::ptree aTree;
 GtkWidget* drawingWidget = GTK_WIDGET(pDocView);
 GdkWindow* drawingWindow = gtk_widget_get_window(drawingWidget);
@@ -342,9 +345,6 @@ doSearch(LOKDocView* pDocView, const char* pText, bool 
bBackwards, bool highligh
 cairo_rectangle_int_t cairoVisRect;
 int x, y;
 
-if (!priv->m_pDocument)
-return;
-
 cairo_region_get_rectangle(cairoVisRegion, 0, &cairoVisRect);
 x = pixelToTwip (cairoVisRect.x, priv->m_fZoom);
 y = pixelToTwip (cairoVisRect.y, priv->m_fZoom);
@@ -2543,13 +2543,13 @@ SAL_DLLPUBLIC_EXPORT void
 lok_doc_view_set_part (LOKDocView* pDocView, int nPart)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
+if (!priv->m_pDocument)
+return;
+
 GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
 LOEvent* pLOEvent = new LOEvent(LOK_SET_PART);
 GError* error = nullptr;
 
-if (!priv->m_pDocument)
-return;
-
 pLOEvent->m_nPart = nPart;
 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
 
@@ -2566,7 +2566,6 @@ SAL_DLLPUBLIC_EXPORT gchar*
 lok_doc_view_get_part_name (LOKDocView* pDocView, int nPart)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
-
 if (!priv->m_pDocument)
 return nullptr;
 
@@ -2682,7 +2681,6 @@ lok_doc_view_post_command (LOKDocView* pDocView,
gboolean bNotifyWhenFinished)
 {
 LOKDocViewPrivate& priv = getPrivate(pDocView);
-
 if (!priv->m_pDocument)
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Pranav Kant

 libreofficekit/source/gtk/lokdocview.cxx |  189 +++
 1 file changed, 92 insertions(+), 97 deletions(-)

New commits:
commit 1fb882cb1e2eedbef688cf2b3a2ca9322486c9cb
Author: Pranav Kant 
Date:   Fri Dec 18 21:58:26 2015 +0530

tdf#96514: Emits a 'notify' signal when zoom changes

Change-Id: I5f55e4cce26096afcae3ad3711efa37757aada39
Reviewed-on: https://gerrit.libreoffice.org/20798
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 398ef76d5dc3ec1ed22fa1d9fd9151b61cce54e2)
Reviewed-on: https://gerrit.libreoffice.org/21273
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index e29db43..d091bb9 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2485,6 +2485,8 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
 nDocumentWidthPixels,
 nDocumentHeightPixels);
 
+g_object_notify_by_pspec(G_OBJECT(pDocView), properties[PROP_ZOOM]);
+
 // Update the client's view size
 GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
 LOEvent* pLOEvent = new LOEvent(LOK_SET_CLIENT_ZOOM);
commit 09c73ad5b1462161b855bf3d43a3d86a3ee28659
Author: Pranav Kant 
Date:   Fri Dec 18 21:51:23 2015 +0530

lokdocview: Use an array to install properties

This way we can directly reference any property by pointers to
GParamSpec stored in a static array, rather than looking for
property using property name. The former is a faster approach.

This will come in handy for functions, such as, g_object_notify
which needs to access properties to notify the object of any
property change in a faster way.

Change-Id: Ic4087bff3bdb63a3e8853d158c7af688e5e67811
Reviewed-on: https://gerrit.libreoffice.org/20797
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 81f31f5151b54899ac5461c9c7c4021cdf31a9a6)
Reviewed-on: https://gerrit.libreoffice.org/21272
Reviewed-by: Pranav Kant 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 426773c..e29db43 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -206,10 +206,13 @@ enum
 PROP_DOC_WIDTH,
 PROP_DOC_HEIGHT,
 PROP_CAN_ZOOM_IN,
-PROP_CAN_ZOOM_OUT
+PROP_CAN_ZOOM_OUT,
+
+PROP_LAST
 };
 
 static guint doc_view_signals[LAST_SIGNAL] = { 0 };
+static GParamSpec *properties[PROP_LAST] = { nullptr };
 
 static void lok_doc_view_initable_iface_init (GInitableIface *iface);
 static void callbackWorker (int nType, const char* pPayload, void* pData);
@@ -2048,15 +2051,14 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  *
  * The absolute path of the LibreOffice install.
  */
-g_object_class_install_property (pGObjectClass,
-  PROP_LO_PATH,
-  g_param_spec_string("lopath",
-  "LO Path",
-  "LibreOffice Install Path",
-  nullptr,
-  static_cast(G_PARAM_READWRITE |
-   G_PARAM_CONSTRUCT_ONLY |
-   
G_PARAM_STATIC_STRINGS)));
+properties[PROP_LO_PATH] =
+g_param_spec_string("lopath",
+"LO Path",
+"LibreOffice Install Path",
+nullptr,
+static_cast(G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
 
 /**
  * LOKDocView:lopointer:
@@ -2064,28 +2066,26 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  * A LibreOfficeKit* in case lok_init() is already called
  * previously.
  */
-g_object_class_install_property (pGObjectClass,
-  PROP_LO_POINTER,
-  g_param_spec_pointer("lopointer",
-   "LO Pointer",
-   "A LibreOfficeKit* from lok_init()",
-   static_cast(G_PARAM_READWRITE |
-G_PARAM_CONSTRUCT_ONLY 
|
-
G_PARAM_STATIC_STRINGS)));
+properties[PROP_LO_POINTER] =
+g_param_spec_pointer("lopointer",
+ "LO Pointer",
+ "A LibreOfficeKit* from lok_init()",
+ static_cast(G_PARAM_READWRITE |
+  G_PARAM_CONSTRUCT_ONLY |
+

[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp

2016-01-11 Thread Miklos Vajna

 loolwsd/ChildProcessSession.cpp |   42 
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit d08b1ff7e24fa8b1c9c43770b3e7ce13212137bd
Author: Miklos Vajna 
Date:   Mon Jan 11 11:17:36 2016 +0100

loolwsd: -Werror=shadow

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index ac2ed50..fdea822 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -63,7 +63,7 @@ ChildProcessSession::~ChildProcessSession()
 {
 Log::info("~ChildProcessSession dtor [" + getName() + "].");
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -145,7 +145,7 @@ bool ChildProcessSession::_handleInput(const char *buffer, 
int length)
tokens[0] == "saveas");
 
 {
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -233,7 +233,7 @@ bool ChildProcessSession::loadDocument(const char * 
/*buffer*/, int /*length*/,
 
 _loKitDocument = _onLoad(getId(), _jailedFilePath);
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _viewId = _loKitDocument->pClass->getView(_loKitDocument);
@@ -274,7 +274,7 @@ void ChildProcessSession::sendFontRendering(const char* 
/*buffer*/, int /*length
 return;
 }
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -307,7 +307,7 @@ void ChildProcessSession::sendFontRendering(const char* 
/*buffer*/, int /*length
 
 bool ChildProcessSession::getStatus(const char* buffer, int length)
 {
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -339,7 +339,7 @@ bool ChildProcessSession::getCommandValues(const char* 
/*buffer*/, int /*length*
 return false;
 }
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -350,7 +350,7 @@ bool ChildProcessSession::getCommandValues(const char* 
/*buffer*/, int /*length*
 
 bool ChildProcessSession::getPartPageRectangles(const char* /*buffer*/, int 
/*length*/)
 {
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -388,7 +388,7 @@ void ChildProcessSession::sendTile(const char* /*buffer*/, 
int /*length*/, Strin
 return;
 }
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -437,7 +437,7 @@ bool ChildProcessSession::clientZoom(const char* 
/*buffer*/, int /*length*/, Str
 return false;
 }
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -471,7 +471,7 @@ bool ChildProcessSession::downloadAs(const char* 
/*buffer*/, int /*length*/, Str
 const auto tmpDir = Util::createRandomDir(JailedDocumentRoot);
 const auto url = JailedDocumentRoot + tmpDir + "/" + name;
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 //TODO: Cleanup the file after downloading.
 _loKitDocument->pClass->saveAs(_loKitDocument, url.c_str(),
@@ -500,7 +500,7 @@ bool ChildProcessSession::getTextSelection(const char* 
/*buffer*/, int /*length*
 return false;
 }
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -524,7 +524,7 @@ bool ChildProcessSession::paste(const char* /*buffer*/, int 
/*length*/, StringTo
 
 data = Poco::cat(std::string(" "), tokens.begin() + 2, 
tokens.end()).substr(strlen("data="));
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -546,7 +546,7 @@ bool ChildProcessSession::insertFile(const char* 
/*buffer*/, int /*length*/, Str
 return false;
 }
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (type == "graphic")
 {
@@ -587,7 +587,7 @@ bool ChildProcessSession::keyEvent(const char* /*buffer*/, 
int /*length*/, Strin
 if (keycode == (KEY_CTRL | KEY_W))
 return true;
 
-std::unique_lock lock(_mutex);
+std::unique_lock uniqueLock(_mutex);
 
 if (_multiView)
 _loKitDocument->p

[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sd/CppunitTest_sd_export_tests.mk sd/qa

2016-01-11 Thread Michael Stahl

 include/oox/export/shapes.hxx |2 
 oox/source/export/shapes.cxx  |6 --
 sd/CppunitTest_sd_export_tests.mk |5 +
 sd/qa/unit/export-tests.cxx   |  107 ++
 sd/qa/unit/sdmodeltestbase.hxx|   20 ---
 5 files changed, 116 insertions(+), 24 deletions(-)

New commits:
commit 92266dd8267481b654efd0dd76f1d145f9dc9e18
Author: Michael Stahl 
Date:   Mon Jan 11 11:03:18 2016 +0100

sd: with any luck the OLE test should run on WNT now too

... with the new implementation in oox.

Change-Id: I65aca6e4151ad7383d45c60430132a45ae3a001e

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 5b1daf5..102a3f4 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -140,9 +140,7 @@ public:
 
 void testFdo90607();
 void testTdf91378();
-#if !defined WNT
 void testBnc822341();
-#endif
 void testTdf80224();
 void testTdf92527();
 
@@ -181,9 +179,7 @@ public:
 CPPUNIT_TEST(testTransparentBackground);
 CPPUNIT_TEST(testTdf91378);
 
-#if !defined WNT
 CPPUNIT_TEST(testBnc822341);
-#endif
 CPPUNIT_TEST(testTdf80224);
 
 CPPUNIT_TEST(testExportTransitionsPPTX);
@@ -1085,8 +1081,6 @@ void SdExportTest::testTdf91378()
 xDocShRef->DoClose();
 }
 
-#if !defined WNT
-
 void SdExportTest::testBnc822341()
 {
 // Check import / export of embedded text document
@@ -1157,8 +1151,6 @@ void SdExportTest::testBnc822341()
 xDocShRef->DoClose();
 }
 
-#endif
-
 void SdExportTest::testBulletMarginAndIndentation()
 {
 ::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/bulletMarginAndIndent.pptx"), PPTX );
commit 7dbdd410daeb6f51127da511990e98e77c62cd83
Author: Michael Stahl 
Date:   Mon Jan 11 11:02:01 2016 +0100

sd: enhance the OLE object test to also test the exported XML

Needs adding various helpers to be able to use XPath.

Change-Id: Ifa7b1e5434fb253430da2bfcc5d38ea347d437af

diff --git a/sd/CppunitTest_sd_export_tests.mk 
b/sd/CppunitTest_sd_export_tests.mk
index 3384377..5e5bafd 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -11,7 +11,10 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sd_export_tests))
 
-$(eval $(call gb_CppunitTest_use_external,sd_export_tests,boost_headers))
+$(eval $(call gb_CppunitTest_use_externals,sd_export_tests,\
+   boost_headers \
+   libxml2 \
+))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_export_tests, \
 sd/qa/unit/export-tests \
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 3ddde53..5b1daf5 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -9,6 +9,7 @@
 #include 
 #include "sdmodeltestbase.hxx"
 #include "Outliner.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -40,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -64,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -99,7 +102,7 @@ CPPUNIT_NS_END
 using namespace css;
 using namespace css::animations;
 
-class SdExportTest : public SdModelTestBase
+class SdExportTest : public SdModelTestBase, public XmlTestTools
 {
 public:
 void testN821567();
@@ -187,6 +190,58 @@ public:
 CPPUNIT_TEST(testTdf92527);
 
 CPPUNIT_TEST_SUITE_END();
+
+virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
+{
+struct { char const * pPrefix; char const * pURI; } namespaces[] =
+{
+// ODF
+{ "draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" },
+{ "fo", 
"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" },
+{ "number", "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
},
+{ "office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0" },
+{ "style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0" },
+{ "svg", 
"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" },
+{ "table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0" },
+{ "text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0" },
+{ "xlink", "http://www.w3c.org/1999/xlink"; },
+// OOXML
+{ "ContentType", 
"http://schemas.openxmlformats.org/package/2006/content-types"; },
+{ "rels", 
"http://schemas.openxmlformats.org/package/2006/relationships"; },
+{ "mc", 
"http://schemas.openxmlformats.org/markup-compatibility/2006"; },
+{ "v", "urn:schemas-microsoft-com:vml" },
+{ "a", "http://schemas.openxmlformats.org/drawingml/2006/main"; },
+{ "c", "http://schemas.openxmlformats.org/drawingml/2006/chart"; },
+{ "pic", 
"http://schemas.openxmlformats.org/drawingml/2006/picture"; },
+{ "wp", 
"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"; },
+{ "p"

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

2016-01-11 Thread Miklos Vajna

 loolwsd/test/httpwstest.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b8ef0c881365a7677a7470a4b94dc200d7ec0dc4
Author: Miklos Vajna 
Date:   Mon Jan 11 11:24:20 2016 +0100

loolwsd: fix make check

After my commit 49b67cdc36b599f865d4a6de214d901861f27196 (tdf#96961 sw
Hide Whitespace: still show whitespace on the last page, 2016-01-08) in
core.git.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 850d606..302993e 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -122,8 +122,8 @@ void HTTPWSTest::testRenderingOptions()
 std::string prefix = "height=";
 CPPUNIT_ASSERT_EQUAL(static_cast(0), token.find(prefix));
 int height = std::stoi(token.substr(prefix.size()));
-// HideWhitespace was ignored, this was 32532.
-CPPUNIT_ASSERT(height < 1);
+// HideWhitespace was ignored, this was 32532, should be around 16706.
+CPPUNIT_ASSERT(height < 2);
 }
 
 void HTTPWSTest::sendTextFrame(Poco::Net::WebSocket& socket, const 
std::string& string)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 95463] Floating Navigator opens with much too small a default size in Writer

2016-01-11 Thread bugzilla-daemon

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

Björn Michaelsen  changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

--- Comment #5 from Björn Michaelsen  ---
(In reply to Commit Notification from comment #4)
> kumar committed a patch related to this issue.
> It has been pushed to "master":

... and thus seems to be fixed. Thanks to kumar for the work!

-- 
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-1' - Makefile.fetch

2016-01-11 Thread Michael Stahl

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

New commits:
commit dd7e6210fa73e201495578c08f5ccbb612eb6456
Author: Michael Stahl 
Date:   Fri Jan 8 15:08:32 2016 +0100

Makefile.fetch: don't use server side time stamps

The wget download apparently uses the time stamp of the file on the
server by default, which breaks incremental builds.

If wget downloads the file and it does not get the current timestamp at
the time of download but the one the file happens to have on the server,
then if you built from the previous version of the tarball at a later
time than the timestamp of the new tarball, make won't detect that it
has to unpack the new tarball.

The curl download should not be affected since curl requires an explicit
-R to use the server side time stamp.

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

diff --git a/Makefile.fetch b/Makefile.fetch
index 1e5c984..7648df6 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log
 
 ifneq (,$(WGET))
 define fetch_Download__wget_command
-&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 
2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
+&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N 
--no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ 
$$PIPESTATUS -eq 0 ]'
 endef
 
 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-1' - include/xmloff sw/inc sw/qa sw/source xmloff/source

2016-01-11 Thread Michael Stahl

 include/xmloff/txtimp.hxx   |3 +
 sw/inc/IDocumentMarkAccess.hxx  |2 
 sw/qa/extras/odfexport/odfexport.cxx|4 -
 sw/source/core/doc/docbm.cxx|6 --
 sw/source/core/inc/MarkManager.hxx  |2 
 sw/source/core/unocore/unobkm.cxx   |9 ---
 xmloff/source/core/xmlimp.cxx   |2 
 xmloff/source/text/XMLTextMarkImportContext.cxx |   46 +-
 xmloff/source/text/XMLTextMarkImportContext.hxx |7 ++
 xmloff/source/text/txtimp.cxx   |   60 
 xmloff/source/text/txtparai.cxx |   38 ---
 11 files changed, 150 insertions(+), 29 deletions(-)

New commits:
commit 74c089fe14b82c796692b7600e78c8fea17e33cf
Author: Michael Stahl 
Date:   Fri Jan 8 16:02:43 2016 +0100

tdf#96480: ODF import: eliminate duplicate cross reference heading bookmarks

7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c is apparently worse than it
appeared at first glance since there are numerous assumptions about
bookmarks, such as that if they were inserted successfully they may be
copied successfully, which isn't the case for duplicate cross reference
bookmarks.

So fix this differently, by eliminating the duplicates and mapping all
reference fields to refer to the surviving bookmark.

It was not possible to do this in SwXBookmark by checking the makeMark()
return as that would raise interesting problems such as it's currently
guaranteed to have 1:1 SwXBoomarks to core Marks so we can't just
connect 2 SwXBookmarks to the same core Mark, and we also can't leave
the SwXBookmark unconnected after attach.

Another alternative would be to temporarily allow inserting the
duplicate bookmarks and then eliminate them after the import, but what
is implemented now is to check from xmloff for duplicates, which is
reasonably simple.

Change-Id: I7ee4854d1c9d8bf74201089cbb7287b1bd8ee3b9
(cherry picked from commit 774fb6d2e7cf36b677e66c54278225b1256bd40f)
Reviewed-on: https://gerrit.libreoffice.org/21277
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 6d9239f..d91e3d0 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -713,6 +713,9 @@ public:
 
 void SetCellParaStyleDefault(OUString const& rNewValue);
 OUString const& GetCellParaStyleDefault();
+
+void AddCrossRefHeadingMapping(OUString const& rFrom, OUString const& rTo);
+void MapCrossRefHeadingFieldsHorribly();
 };
 
 #endif
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index d071f41..a0bdeb6 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -77,7 +77,7 @@ class IDocumentMarkAccess
 */
 virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM,
 const OUString& rProposedName,
-MarkType eMark, bool = false) = 0;
+MarkType eMark) = 0;
 
 virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
 const OUString& rName,
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index addf9c5..04d1d3c 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -421,9 +421,7 @@ 
DECLARE_ODFEXPORT_TEST(testDuplicateCrossRefHeadingBookmark, "CrossRefHeadingBoo
 uno::Reference xBookmark1(
 xBookmarks->getByName("__RefHeading__8284_1826734303"), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xBookmark1.is());
-uno::Reference xBookmark2(
-xBookmarks->getByName("__RefHeading__1673_25705824"), uno::UNO_QUERY);
-CPPUNIT_ASSERT(xBookmark2.is());
+CPPUNIT_ASSERT_THROW(xBookmarks->getByName("__RefHeading__1673_25705824"), 
container::NoSuchElementException);
 
 uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference(xTextFieldsSupplier->getTextFields(), 
uno::UNO_QUERY)->refresh();
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 6efca0e..90f466f 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -349,8 +349,7 @@ namespace sw { namespace mark
 
 ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
 const OUString& rName,
-const IDocumentMarkAccess::MarkType eType,
-bool const isHorribleHackIgnoreDuplicates)
+const IDocumentMarkAccess::MarkType eType)
 {
 #if 0
 {
@@ -373,8 +372,7 @@ namespace sw { namespace mark
 " - more than USHRT_MAX marks are not supported correctly");
 // There should only be one CrossRefBookmark per Textnode per Type
 if ((eType == MarkType::CROSSREF_NUMITEM_BOOKMARK || eType == 
MarkType::CROSSREF_HEADING_BOOKMARK)
-&& (lcl_FindMarkAtPos(m_vBookmarks, *rPaM.Start(), eType) !=

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source

2016-01-11 Thread Matúš Kukan

 framework/source/services/frame.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 013beaceb8c6daf2bf7f804631a3385e35144152
Author: MatÃºÅ¡ Kukan 
Date:   Mon Nov 23 22:07:12 2015 +0100

Make this static WeakReference local to Frame::impl_checkMenuCloser()

..to avoid problem shown with comphelper added to libmerged. More info in
http://lists.freedesktop.org/archives/libreoffice/2015-November/071189.html

(cherry picked from commit c6122fe6143ff1efa9f449d46a848cf3071ac67e)

Apparently it was problem also without merged comphelper. Seen in
CppunitTest_libreofficekit_tiledrendering in libreoffice-5-1.

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

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 754768e..bcd12d4 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -402,7 +402,6 @@ private:
 SvtCommandOptions   
m_aCommandOptions;   /// ref counted class to support disabling 
commands defined by configuration file
 bool
m_bSelfClose;/// in case of CloseVetoException on method 
close() was thrown by ourself - we must close ourself later if no internal 
processes are running
 bool
m_bIsHidden; /// indicates, if this frame is used in hidden 
mode or not
-static css::uno::WeakReference< css::frame::XFrame2 >   
m_xCloserFrame;  /// holds the only frame, which must show the 
special closer menu item (can be NULL!)
 css::uno::Reference< css::frame::XLayoutManager2 >  
m_xLayoutManager;/// is used to layout the child windows of the 
frame.
 css::uno::Reference< css::frame::XDispatchInformationProvider > 
m_xDispatchInfoHelper;
 css::uno::Reference< css::frame::XTitle >   
m_xTitleHelper;
@@ -414,8 +413,6 @@ protected:
 FrameContainer  
m_aChildFrameContainer;   /// array of child frames
 };
 
-css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame;
-
 //  XInterface, XTypeProvider, XServiceInfo
 
 DEFINE_XINTERFACE_22(   Frame  
 ,
@@ -3206,15 +3203,16 @@ void Frame::impl_checkMenuCloser()
 // Only if the closer state must be moved from one frame to another one
 // or must be enabled/disabled at all.
 SolarMutexGuard aGuard;
-
-css::uno::Reference< css::frame::XFrame2 > xCloserFrame 
(m_xCloserFrame.get(), css::uno::UNO_QUERY);
+// Holds the only frame, which must show the special closer menu item (can 
be NULL!)
+static css::uno::WeakReference< css::frame::XFrame2 > s_xCloserFrame;
+css::uno::Reference< css::frame::XFrame2 > xCloserFrame 
(s_xCloserFrame.get(), css::uno::UNO_QUERY);
 if (xCloserFrame!=xNewCloserFrame)
 {
 if (xCloserFrame.is())
 impl_setCloser(xCloserFrame, false);
 if (xNewCloserFrame.is())
 impl_setCloser(xNewCloserFrame, true);
-m_xCloserFrame = xNewCloserFrame;
+s_xCloserFrame = xNewCloserFrame;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes14' - vcl/inc vcl/win

2016-01-11 Thread Tor Lillqvist

 vcl/inc/win/salgdi.h |   11 
 vcl/win/source/gdi/salgdi.cxx|5 
 vcl/win/source/gdi/salgdi3.cxx   |   40 -
 vcl/win/source/gdi/winlayout.cxx |  828 ---
 vcl/win/source/gdi/winlayout.hxx |   45 --
 5 files changed, 10 insertions(+), 919 deletions(-)

New commits:
commit b8e719b73ce6c27c5cf5376c2669bfe530b36014
Author: Tor Lillqvist 
Date:   Mon Jan 11 13:11:25 2016 +0200

Revert "tdf#96420: Re-introduce SimpleWinLayout"

This reverts commit 9123edb25359e5e1c781139ac8b02bd361f7a60f.

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index dd2452f..4ff01fa 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -214,9 +214,6 @@ private:
 RGNDATA*mpClipRgnData;  // ClipRegion-Data
 RGNDATA*mpStdClipRgnData;   // Cache 
Standard-ClipRegion-Data
 ImplFontAttrCache*  mpFontAttrCache;// Cache font attributes from 
files in so/share/fonts
-boolmbFontKernInit; // FALSE: FontKerns must be 
queried
-KERNINGPAIR*mpFontKernPairs;// Kerning Pairs of the 
current Font
-sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of 
the current Font
 int mnPenWidth; // Linienbreite
 
 public:
@@ -333,12 +330,6 @@ protected:
const SalBitmap* pAlphaBitmap) override;
 virtual bool   drawAlphaRect( long nX, long nY, long nWidth, long 
nHeight, sal_uInt8 nTransparency ) override;
 
-private:
-// local helpers
-
-// get kernign pairs of the current font
-sal_uLong   GetKernPairs();
-
 public:
 // public SalGraphics methods, the interface to the independent vcl part
 
@@ -460,7 +451,7 @@ voidImplGetLogFontFromFontSelect( HDC, const 
FontSelectPattern*,
 #define MAX_64KSALPOINTSsal_uInt16)0x)-8)/sizeof(POINTS))
 
 // #102411# Win's GCP mishandles kerning => we need to do it ourselves
-// SalGraphicsData::mpFontKernPairs is sorted by
+// kerning pairs is sorted by
 inline bool ImplCmpKernData( const KERNINGPAIR& a, const KERNINGPAIR& b )
 {
 if( a.wFirst < b.wFirst )
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 42ab90e..5f29820 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -631,9 +631,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, 
bool bScreen, HWND hW
 mhDefPal(0),
 mpStdClipRgnData(NULL),
 mpFontAttrCache(NULL),
-mpFontKernPairs(NULL),
-mnFontKernPairCount(0),
-mbFontKernInit(false),
 mnPenWidth(GSL_PEN_WIDTH)
 {
 if (OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter)
@@ -663,8 +660,6 @@ WinSalGraphics::~WinSalGraphics()
 
 // delete cache data
 delete [] (BYTE*)mpStdClipRgnData;
-
-delete [] mpFontKernPairs;
 }
 
 SalGraphicsImpl* WinSalGraphics::GetImpl() const
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 4de6530..9412799 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1559,17 +1559,6 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* 
pFont, int nFallbackLevel
 if( mpWinFontData[ nFallbackLevel ] )
 mpWinFontData[ nFallbackLevel ]->UpdateFromHDC( getHDC() );
 
-if( !nFallbackLevel )
-{
-mbFontKernInit = TRUE;
-if ( mpFontKernPairs )
-{
-delete[] mpFontKernPairs;
-mpFontKernPairs = NULL;
-}
-mnFontKernPairCount = 0;
-}
-
 // some printers have higher internal resolution, so their
 // text output would be different from what we calculated
 // => suggest DrawTextArray to workaround this problem
@@ -1656,35 +1645,6 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* 
pMetric, int nFallbackLe
 pMetric->mnMinKashida = GetMinKashidaWidth();
 }
 
-sal_uLong WinSalGraphics::GetKernPairs()
-{
-if ( mbFontKernInit )
-{
-if( mpFontKernPairs )
-{
-delete[] mpFontKernPairs;
-mpFontKernPairs = NULL;
-}
-mnFontKernPairCount = 0;
-
-KERNINGPAIR* pPairs = NULL;
-int nCount = ::GetKerningPairsW( getHDC(), 0, NULL );
-if( nCount )
-{
-pPairs = new KERNINGPAIR[ nCount+1 ];
-mpFontKernPairs = pPairs;
-mnFontKernPairCount = nCount;
-::GetKerningPairsW( getHDC(), nCount, pPairs );
-}
-
-mbFontKernInit = FALSE;
-
-std::sort( mpFontKernPairs, mpFontKernPairs + mnFontKernPairCount, 
ImplCmpKernData );
-}
-
-return mnFontKernPairCount;
-}
-
 const FontCharMapPtr WinSalGraphics::GetFontCharMap() const
 {
 if( !mpWinFontData[0] )
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index f334fda..cef4f8a 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -47,8 +47,6 @@
 
 #include

[Libreoffice-commits] core.git: 3 commits - filter/source forms/source framework/inc framework/source

2016-01-11 Thread Noel Grandin

 filter/source/svg/svgexport.cxx   |   46 ++--
 filter/source/svg/svgfilter.hxx   |   14 +-
 filter/source/svg/svgwriter.cxx   |4 
 filter/source/svg/svgwriter.hxx   |5 
 filter/source/xsltdialog/xmlfiltertabpagebasic.cxx|4 
 filter/source/xsltdialog/xmlfiltertabpagebasic.hxx|2 
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx |4 
 filter/source/xsltdialog/xmlfiltertabpagexslt.hxx |2 
 forms/source/component/FormComponent.cxx  |4 
 forms/source/component/GroupManager.cxx   |5 
 forms/source/component/GroupManager.hxx   |2 
 forms/source/inc/FormComponent.hxx|2 
 forms/source/runtime/formoperations.cxx   |   16 +-
 forms/source/runtime/formoperations.hxx   |4 
 forms/source/xforms/pathexpression.cxx|8 -
 forms/source/xforms/pathexpression.hxx|2 
 framework/inc/classes/fwktabwindow.hxx|4 
 framework/inc/threadhelp/gate.hxx |   10 -
 framework/inc/uielement/toolbarmanager.hxx|2 
 framework/source/classes/fwktabwindow.cxx |4 
 framework/source/fwe/classes/addonsoptions.cxx|   54 +++---
 framework/source/uiconfiguration/globalsettings.cxx   |8 -
 framework/source/uiconfiguration/uicategorydescription.cxx|   16 --
 framework/source/uiconfiguration/windowstateconfiguration.cxx |8 -
 framework/source/uielement/toolbarmanager.cxx |6 -
 framework/source/uielement/uicommanddescription.cxx   |   22 +---
 26 files changed, 84 insertions(+), 174 deletions(-)

New commits:
commit 13e894bb522f17d530922abb8e6b787fb83091f7
Author: Noel Grandin 
Date:   Mon Jan 11 13:13:44 2016 +0200

loplugin:unusedmethods unused return value in framework

Change-Id: I6e02f34702ba59a961c3fec3d025e775f4e26760

diff --git a/framework/inc/classes/fwktabwindow.hxx 
b/framework/inc/classes/fwktabwindow.hxx
index a13ed54..6fdea7a 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -114,10 +114,10 @@ public:
 
 voidAddEventListener( const Link& 
rEventListener );
 voidRemoveEventListener( const Link& 
rEventListener );
-FwkTabPage* AddTabPage( sal_Int32 nIndex, const css::uno::Sequence< 
css::beans::NamedValue >& rProperties );
+voidAddTabPage( sal_Int32 nIndex, const css::uno::Sequence< 
css::beans::NamedValue >& rProperties );
 voidActivatePage( sal_Int32 nIndex );
 voidRemovePage( sal_Int32 nIndex );
-virtual voidResize() override;
+virtual voidResize() override;
 };
 
 } // namespace framework
diff --git a/framework/inc/threadhelp/gate.hxx 
b/framework/inc/threadhelp/gate.hxx
index cb4a3fb..9ba5db8 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -108,17 +108,13 @@ class Gate : private boost::noncopyable
 @seealsomethod open()
 
 @param  "pTimeOut", optional parameter to wait a certain time
-@return true, if wait was successful (gate was opened)
-false, if condition has an error or timeout was 
reached!
 
-@onerrorWe return false.
 
*//*-*/
-bool wait(const TimeValue* pTimeOut = nullptr)
+void wait(const TimeValue* pTimeOut = nullptr)
 {
 // We must safe access to our internal member!
 ::osl::ClearableMutexGuard aLock( m_aAccessLock );
 // If gate not closed - caller can pass it.
-bool bSuccessful = true;
 if( m_bClosed )
 {
 // Then we must release used access lock -
@@ -126,10 +122,8 @@ class Gate : private boost::noncopyable
 // and if we hold the access lock nobody else can use this 
object without a deadlock!
 aLock.clear();
 // Wait for opening gate...
-bSuccessful = ( m_aPassage.wait( pTimeOut ) == 
::osl::Condition::result_ok );
+m_aPassage.wait( pTimeOut );
 }
-
-return bSuccessful;
 }
 
 //  private member
diff --git a/framework/inc/uielement/toolbarmanager.hxx 
b/framework/inc/uielement/toolbarmanager.hxx
index 90f66ed..cd912f1 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -146,7 +146,7 @@ class ToolBarManager : public ToolbarManager_Base
 ToolBoxItemBits ConvertStyleToToolboxItemBits( sa

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

2016-01-11 Thread Pranav Kant

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

New commits:
commit 02b49890d51ec463d32846f1108344159664a9eb
Author: Pranav Kant 
Date:   Sun Jan 10 22:50:46 2016 +0530

lokdocview: Use shared_ptr to fix a possible memory leak

Possible because boost::property_tree can throw an exception.

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

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 168338d..5df7746 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -343,13 +344,12 @@ doSearch(LOKDocView* pDocView, const char* pText, bool 
bBackwards, bool highligh
 boost::property_tree::ptree aTree;
 GtkWidget* drawingWidget = GTK_WIDGET(pDocView);
 GdkWindow* drawingWindow = gtk_widget_get_window(drawingWidget);
-cairo_region_t* cairoVisRegion = 
gdk_window_get_visible_region(drawingWindow);
+std::shared_ptr cairoVisRegion( 
gdk_window_get_visible_region(drawingWindow),
+cairo_region_destroy);
 cairo_rectangle_int_t cairoVisRect;
-int x, y;
-
-cairo_region_get_rectangle(cairoVisRegion, 0, &cairoVisRect);
-x = pixelToTwip (cairoVisRect.x, priv->m_fZoom);
-y = pixelToTwip (cairoVisRect.y, priv->m_fZoom);
+cairo_region_get_rectangle(cairoVisRegion.get(), 0, &cairoVisRect);
+int x = pixelToTwip (cairoVisRect.x, priv->m_fZoom);
+int y = pixelToTwip (cairoVisRect.y, priv->m_fZoom);
 
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchString/type",
 '/'), "string");
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchString/value",
 '/'), pText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread David Tardon

 libreofficekit/source/gtk/lokdocview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 080a9c3a5107347a74bb17bad185d418561d9d77
Author: David Tardon 
Date:   Mon Jan 11 12:15:38 2016 +0100

iostream is not needed

Change-Id: I481b402e0d3b42de5b486a159acb8a25e345b8b8

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 5df7746..fcc170b 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -13,7 +13,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Pranav Kant

 libreofficekit/source/gtk/lokdocview.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4200a678fb54f0fa5d2f0c26c655252f9267a527
Author: Pranav Kant 
Date:   Fri Dec 18 22:42:53 2015 +0530

tdf#96421: Return if no window is realized

Change-Id: I13de7e6eae4e73932e8441ba2e2ad3e4ff888f41
Reviewed-on: https://gerrit.libreoffice.org/20799
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index fcc170b..c1f550a 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -344,6 +344,8 @@ doSearch(LOKDocView* pDocView, const char* pText, bool 
bBackwards, bool highligh
 boost::property_tree::ptree aTree;
 GtkWidget* drawingWidget = GTK_WIDGET(pDocView);
 GdkWindow* drawingWindow = gtk_widget_get_window(drawingWidget);
+if (!drawingWindow)
+return;
 std::shared_ptr cairoVisRegion( 
gdk_window_get_visible_region(drawingWindow),
 cairo_region_destroy);
 cairo_rectangle_int_t cairoVisRect;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Pranav Kant

 include/LibreOfficeKit/LibreOfficeKitGtk.h |4 +++-
 libreofficekit/source/gtk/lokdocview.cxx   |   29 +++--
 2 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit ba539fa91f9c3316107dcdf4a95718a49335d92e
Author: Pranav Kant 
Date:   Sat Dec 19 20:36:47 2015 +0530

tdf#96513: Limit LOKDocView's zoom in [0.25, 5.0]

Change-Id: Ibee485909dca1ea4a3774fca7a840afbf2d9883c
Reviewed-on: https://gerrit.libreoffice.org/20819
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 911bbdf..e06d154 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -107,7 +107,9 @@ LibreOfficeKitDocument*lok_doc_view_get_document
   (LOKDocView*
  * @pDocView: The #LOKDocView instance
  * @fZoom: The new zoom level that pDocView must set it into.
  *
- * Sets the new zoom level for the widget.
+ * Sets the new zoom level for the widget. Does nothing if fZoom is equal to
+ * existing zoom level. Values outside the range [0.25, 5.0] are clamped into
+ * the nearest allowed value in the interval.
  */
 void   lok_doc_view_set_zoom   
(LOKDocView* pDocView,
 float 
fZoom);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index c1f550a..383f35f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -38,6 +38,10 @@
 #define CURSOR_HANDLE_DIR "/android/source/res/drawable/"
 // Number of handles around a graphic selection.
 #define GRAPHIC_HANDLE_COUNT 8
+// Maximum Zoom allowed
+#define MAX_ZOOM 5.0f
+// Minimum Zoom allowed
+#define MIN_ZOOM 0.25f
 
 /// Private struct used by this GObject type
 struct LOKDocViewPrivateImpl
@@ -124,8 +128,8 @@ struct LOKDocViewPrivateImpl
 m_aDocPath(nullptr),
 m_nLoadProgress(0),
 m_bIsLoading(false),
-m_bCanZoomIn(false),
-m_bCanZoomOut(false),
+m_bCanZoomIn(true),
+m_bCanZoomOut(true),
 m_pOffice(nullptr),
 m_pDocument(nullptr),
 lokThreadPool(nullptr),
@@ -2475,6 +2479,13 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
 LOKDocViewPrivate& priv = getPrivate(pDocView);
 GError* error = nullptr;
 
+// Clamp the input value in [MIN_ZOOM, MAX_ZOOM]
+fZoom = fZoom < MIN_ZOOM ? MIN_ZOOM : fZoom;
+fZoom = fZoom > MAX_ZOOM ? MAX_ZOOM : fZoom;
+
+if (fZoom == priv->m_fZoom)
+return;
+
 priv->m_fZoom = fZoom;
 long nDocumentWidthPixels = twipToPixel(priv->m_nDocumentWidthTwips, 
fZoom);
 long nDocumentHeightPixels = twipToPixel(priv->m_nDocumentHeightTwips, 
fZoom);
@@ -2489,6 +2500,20 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
 
 g_object_notify_by_pspec(G_OBJECT(pDocView), properties[PROP_ZOOM]);
 
+// set properties to indicate if view can be further zoomed in/out
+bool bCanZoomIn  = priv->m_fZoom < MAX_ZOOM;
+bool bCanZoomOut = priv->m_fZoom > MIN_ZOOM;
+if (bCanZoomIn != priv->m_bCanZoomIn)
+{
+priv->m_bCanZoomIn = bCanZoomIn;
+g_object_notify_by_pspec(G_OBJECT(pDocView), 
properties[PROP_CAN_ZOOM_IN]);
+}
+if (bCanZoomOut != priv->m_bCanZoomOut)
+{
+priv->m_bCanZoomOut = bCanZoomOut;
+g_object_notify_by_pspec(G_OBJECT(pDocView), 
properties[PROP_CAN_ZOOM_OUT]);
+}
+
 // Update the client's view size
 GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
 LOEvent* pLOEvent = new LOEvent(LOK_SET_CLIENT_ZOOM);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Ras-al-Ghul

 vcl/source/window/toolbox2.cxx |   21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 0f3a3c38bb4e7c4b4717e8dd7999fecba1288275
Author: Ras-al-Ghul 
Date:   Sat Jan 9 21:58:11 2016 +0530

tdf#96888 Kill internal vcl dog-tags ..

Made pBorderWin a VclPtr

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

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index e288bbe..b2c7564 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -432,15 +432,13 @@ void ToolBox::Highlight()
 
 void ToolBox::Select()
 {
-ImplDelData aDelData;
-ImplAddDel( &aDelData );
+VclPtr xWindow = this;
 
 CallEventListeners( VCLEVENT_TOOLBOX_SELECT );
 maSelectHdl.Call( this );
 
-if ( aDelData.IsDead() )
+if ( xWindow->IsDisposed() )
 return;
-ImplRemoveDel( &aDelData );
 
 // TODO: GetFloatingWindow in DockingWindow is currently inline, change it 
to check dockingwrapper
 ImplDockingWindowWrapper *pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper( this );
@@ -1892,22 +1890,19 @@ void ToolBox::ImplExecuteCustomMenu()
 GetMenu()->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
 
 // toolbox might be destroyed during execute
-ImplDelData aDelData;
-ImplAddDel( &aDelData );
-ImplDelData aBorderDel;
 bool bBorderDel = false;
 
-vcl::Window *pWin = this;
+VclPtr pWin = this;
 Rectangle aMenuRect = mpData->maMenubuttonItem.maRect;
+VclPtr pBorderWin;
 if( IsFloatingMode() )
 {
 // custom menu is placed in the decoration
-ImplBorderWindow *pBorderWin = dynamic_cast( 
GetWindow( GetWindowType::Border ) );
+pBorderWin = dynamic_cast( GetWindow( 
GetWindowType::Border ) );
 if( pBorderWin && !pBorderWin->GetMenuRect().IsEmpty() )
 {
 pWin = pBorderWin;
 aMenuRect = pBorderWin->GetMenuRect();
-pWin->ImplAddDel( &aBorderDel );
 bBorderDel = true;
 }
 }
@@ -1915,17 +1910,15 @@ void ToolBox::ImplExecuteCustomMenu()
 sal_uInt16 uId = GetMenu()->Execute( pWin, Rectangle( 
ImplGetPopupPosition( aMenuRect, Size() ), Size() ),
 PopupMenuFlags::ExecuteDown | 
PopupMenuFlags::NoMouseUpClose );
 
-if ( aDelData.IsDead() )
+if ( pWin->IsDisposed() )
 return;
-ImplRemoveDel( &aDelData );
 
 if( GetMenu() )
 GetMenu()->RemoveEventListener( LINK( this, ToolBox, 
ImplCustomMenuListener ) );
 if( bBorderDel )
 {
-if( aBorderDel.IsDead() )
+if( pBorderWin->IsDisposed() )
 return;
-pWin->ImplRemoveDel( &aBorderDel );
 }
 
 pWin->Invalidate( aMenuRect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SwFormat::DerviedFrom()

2016-01-11 Thread Bjoern Michaelsen

Hi,

On Sun, Jan 03, 2016 at 10:43:05AM +0100, Markus Mohrhard wrote:
> > In fact, wouldn’t a dynamic_cast be better, as this most specifically down
> > or upcasts a pointer, and returns NULL if it fails?
> >
> 
> That depends on all the code around it. Here the code just assumes that all
> returned SwModify objects are actually SwFormat objects.

This is the core of the issue:
- Practically everything in writer is a SwClient, and most is a SwModify too
- Instead of using this as the (already quite broken) Observer pattern
  implementation, a lot of (esp. layout code) code (ab-)uses the client/modify
  relation for various other relations making wild assumptions on the type of
  object behind a GetRegisteredIn() or the kind of listeners an SwModify can 
have
  ...

> > Any advise on this would be greatly appreciated, got me thoroughly
> > tricked...

Congratulations on finding the dark secret of writer: Everything in sw is a
SwClient and those are all connected in a mad web of intrinsic double-linked
list of effective void-pointers (as m_pLeft and m_pRight in WriterListener are
WriterListeners, pRegisteredIn in SwModify is also a WriterListener and
_everthing_ of relevance in sw a WriterListener).

Best,

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

[Libreoffice-commits] core.git: 3 commits - hwpfilter/source i18npool/source idl/inc idl/source

2016-01-11 Thread Noel Grandin

 hwpfilter/source/formula.cxx  |6 ++
 hwpfilter/source/formula.h|2 +-
 hwpfilter/source/hfont.cxx|7 +++
 hwpfilter/source/hfont.h  |2 +-
 hwpfilter/source/hinfo.cxx|   29 +
 hwpfilter/source/hinfo.h  |4 ++--
 hwpfilter/source/hpara.cxx|   18 --
 hwpfilter/source/hpara.h  |2 +-
 hwpfilter/source/htags.cxx|   19 ---
 hwpfilter/source/htags.h  |4 ++--
 hwpfilter/source/hwpfile.cxx  |   31 +--
 hwpfilter/source/hwpfile.h|   14 +++---
 i18npool/source/search/levdis.cxx |3 +--
 i18npool/source/search/levdis.hxx |2 +-
 idl/inc/basobj.hxx|4 ++--
 idl/inc/bastype.hxx   |   10 +++---
 idl/inc/database.hxx  |2 +-
 idl/inc/hash.hxx  |4 
 idl/source/objects/basobj.cxx |3 +--
 idl/source/objects/bastype.cxx|   14 ++
 idl/source/prj/database.cxx   |3 +--
 21 files changed, 81 insertions(+), 102 deletions(-)

New commits:
commit ea5b48e9da1ea750cc4549f7cd76771800101ed2
Author: Noel Grandin 
Date:   Mon Jan 11 13:31:24 2016 +0200

loplugin:unusedmethods unused return value in idl

Change-Id: I790fea8b88ca99d17de14f1e91081671422dd8db

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index e3ad1e5..0725e6d 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -128,7 +128,7 @@ public:
 
 voidPush( SvMetaObject * pObj )
 { aList.push_back( pObj ); }
-SvMetaObject *  Pop() { return aList.pop_back(); }
+voidPop() { aList.pop_back(); }
 SvMetaObject *  Get( std::function 
isSvMetaObject )
 {
 for( SvMetaObjectMemberList::reverse_iterator it = 
aList.rbegin(); it != aList.rend(); ++it )
@@ -200,7 +200,7 @@ public:
 
 SvMetaModule *  GetModule() const;
 
-const SvGlobalName &GetUUId() const;
+voidGetUUId() const;
 voidSetModule( SvIdlDataBase & rBase );
 virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) 
override;
 
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 04335fd..f31121a 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -79,8 +79,8 @@ public:
 sal_uInt32  GetValue() const { return nValue; }
 voidSetValue( sal_uInt32 nVal ) { nValue = nVal; }
 
-boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-boolReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
+voidReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+voidReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
SvTokenStream & rInStm );
 };
 
@@ -112,7 +112,7 @@ class SvHelpText : public SvString
 {
 public:
 SvHelpText() {}
-boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+voidReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
 };
 
 
@@ -139,10 +139,6 @@ public:
 return (r.nMajorVersion == nMajorVersion)
  && (r.nMinorVersion == nMinorVersion);
 }
-booloperator != ( const SvVersion & r )
-{
-return !(*this == r);
-}
 
 boolReadSvIdl( SvTokenStream & rInStm );
 };
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 3bf5e0c..f7658b2 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -126,7 +126,7 @@ public:
 SvMetaAttribute *   SearchKnownAttr( const SvIdentifier& );
 SvMetaClass *   ReadKnownClass( SvTokenStream & rInStm );
 void AddDepFile(OUString const& rFileName);
-bool WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
+void WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
 };
 
 class SvIdlWorkingBase : public SvIdlDataBase
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 9a3374b..39fdf76 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -79,8 +79,6 @@ public:
 
 booloperator == ( const SvStringHashEntry & rRef )
 { return nHashId == rRef.nHashId; }
-booloperator != ( const SvStringHashEntry & rRef )
-{ return ! operator == ( rRef ); }
 SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
 { SvRefBase::operator=( rRef );
   aName   = rRef.aName;
@@ -110,8 +108,6 @@ public:
 boolInsert( const OString& rStr, sal_uInt32 * pHash ); // insert string
 boolTest( const OString& rStr, sal_uInt32 * pHash ) const; // test of 
insert string
 SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to 
string
-SvStringHashEntry & operator []( sal_uInt32 nPos ) const
-{ return pEntries

[Libreoffice-commits] core.git: 9 commits - avmedia/source basctl/source chart2/source compilerplugins/clang dbaccess/source drawinglayer/source editeng/source extensions/source filter/source forms/so

2016-01-11 Thread Stephan Bergmann

 avmedia/source/vlc/wrapper/EventHandler.hxx
 |2 
 avmedia/source/vlc/wrapper/EventManager.hxx
 |2 
 avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx 
 |4 
 basctl/source/inc/doceventnotifier.hxx 
 |2 
 chart2/source/controller/main/ElementSelector.hxx  
 |2 
 chart2/source/view/inc/VDataSeries.hxx 
 |2 
 compilerplugins/clang/privatebase.cxx  
 |   54 ++
 dbaccess/source/ui/inc/sqledit.hxx 
 |2 
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx 
 |6 -
 editeng/source/editeng/editdoc.cxx 
 |   10 -
 editeng/source/editeng/editdoc.hxx 
 |2 
 editeng/source/editeng/editobj.cxx 
 |4 
 editeng/source/editeng/editobj2.hxx
 |4 
 editeng/source/editeng/impedit.hxx 
 |2 
 extensions/source/scanner/sane.hxx 
 |2 
 extensions/source/update/check/updatehdl.hxx   
 |2 
 filter/source/config/cache/typedetection.cxx   
 |2 
 filter/source/svg/test/odfserializer.cxx   
 |2 
 forms/source/xforms/datatypes.hxx  
 |2 
 include/vcl/debugevent.hxx 
 |2 
 package/source/xstor/owriteablestream.hxx  
 |2 
 sc/inc/chart2uno.hxx   
 |8 -
 sc/inc/clipcontext.hxx 
 |2 
 sc/inc/columniterator.hxx  
 |2 
 sc/inc/columnspanset.hxx   
 |2 
 sc/inc/documentimport.hxx  
 |2 
 sc/inc/documentlinkmgr.hxx 
 |2 
 sc/inc/dpcache.hxx 
 |2 
 sc/inc/dpresfilter.hxx 
 |2 
 sc/inc/dptabsrc.hxx
 |4 
 sc/inc/externalrefmgr.hxx  
 |2 
 sc/inc/listenercontext.hxx 
 |6 -
 sc/inc/scmod.hxx   
 |2 
 sc/inc/table.hxx   
 |2 
 sc/inc/textuno.hxx 
 |2 
 sc/inc/typedstrdata.hxx
 |2 
 sc/qa/extras/scannotationobj.cxx   
 |2 
 sc/qa/extras/scannotationshapeobj.cxx  
 |2 
 sc/qa/extras/scannotationsobj.cxx  
 |2 
 sc/qa/extras/sccellrangeobj.cxx
 |4 
 sc/qa/extras/scdatabaserangeobj.cxx
 |2 
 sc/qa/extras/scdatapilotfieldobj.cxx   
 |4 
 sc/qa/extras/scdatapilottableobj.cxx   
 |4 
 sc/qa/extras/sceditfieldobj-cell.cxx   
 |2 
 sc/qa/extras/sceditfieldobj-header.cxx 
 |2 
 sc/qa/extras/scmodelobj.cxx
 |2 
 sc/qa/extras/scnamedrangeobj.cxx   
 |2 
 sc/qa/extras/scnamedrangesobj.cxx  
 |2 
 sc/qa/extras/scoutlineobj.cxx  
 |2 
 sc/qa/extras/scstyleloaderobj.cxx  
 |2 
 sc/qa/extras/sctablesheetobj.cxx   
 |2 
 sc/qa/extras/sctablesheetsobj.cxx  
 |2 
 sc/qa/unit/subsequent_export-test.cxx  
 |2 
 sc/qa/unit/subsequent_filters-test.cxx 
 |2 
 sc/source/core/data/column.cxx 
 |4 
 sc/source/core/data/column3.cxx

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

2016-01-11 Thread Stephan Bergmann

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

New commits:
commit ac1f0b59043a02e4d430cade3cc5b8b069feed87
Author: Stephan Bergmann 
Date:   Mon Jan 11 13:24:33 2016 +0100

Silence loplugin:implicitboolconversion between bool and gboolean

Change-Id: I83ce360622eea0fb805833650c0d2126bcd5d8db

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 383f35f..87b6ca0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2503,12 +2503,12 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float 
fZoom)
 // set properties to indicate if view can be further zoomed in/out
 bool bCanZoomIn  = priv->m_fZoom < MAX_ZOOM;
 bool bCanZoomOut = priv->m_fZoom > MIN_ZOOM;
-if (bCanZoomIn != priv->m_bCanZoomIn)
+if (bCanZoomIn != bool(priv->m_bCanZoomIn))
 {
 priv->m_bCanZoomIn = bCanZoomIn;
 g_object_notify_by_pspec(G_OBJECT(pDocView), 
properties[PROP_CAN_ZOOM_IN]);
 }
-if (bCanZoomOut != priv->m_bCanZoomOut)
+if (bCanZoomOut != bool(priv->m_bCanZoomOut))
 {
 priv->m_bCanZoomOut = bCanZoomOut;
 g_object_notify_by_pspec(G_OBJECT(pDocView), 
properties[PROP_CAN_ZOOM_OUT]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Debarshi Ray

 libreofficekit/source/gtk/lokdocview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ba1b60c97b342c13593d37ccf2b97a919808dfc
Author: Debarshi Ray 
Date:   Fri Jan 8 18:06:18 2016 +0100

lokdocview: Fix WARNING when creating an error

A GError needs a valid GQuark as the domain. Passing 0 leads to:
  GLib-WARNING **: (gerror.c:408):g_error_new_valist: runtime check
failed: (domain != 0)

Change-Id: I2f252eaa83a1519b5d16c7ba22c8f593732807ca
Reviewed-on: https://gerrit.libreoffice.org/21261
Tested-by: Jenkins 
Reviewed-by: Pranav Kant 
Reviewed-by: jan iversen 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 87b6ca0..140479b 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1684,7 +1684,7 @@ openDocumentInThread (gpointer data)
 if ( !priv->m_pDocument )
 {
 char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice );
-g_task_return_new_error(task, 0, 0, "%s", pError);
+g_task_return_new_error(task, g_quark_from_static_string ("LOK 
error"), 0, "%s", pError);
 }
 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' - oox/source sw/qa

2016-01-11 Thread Miklos Vajna

 oox/source/drawingml/shape.cxx  |   13 -
 sw/qa/extras/ooxmlimport/data/tdf96674.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   10 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit c5f4c528123d6c65b489ac18ab7892bc92866b09
Author: Miklos Vajna 
Date:   Tue Jan 5 09:08:21 2016 +0100

tdf#96674 drawingML import: fix handling of zero width/height lines

(cherry picked from commit 627c2469843c9461b665c4571f1214aca7fc36a4)

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

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d7247be..4a9223f 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -510,7 +510,18 @@ Reference< XShape > Shape::createAndInsert(
 bool bIsWriter = 
xModelInfo->supportsService("com.sun.star.text.TextDocument");
 for( i = 0; i < nNumPoints; ++i )
 {
-const ::basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) );
+basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) );
+
+// Guard against zero width or height.
+if (i)
+{
+const basegfx::B2DPoint& rPreviousPoint = aPoly.getB2DPoint(i 
- 1);
+if (aPoint.getX() - rPreviousPoint.getX() == 0)
+aPoint.setX(aPoint.getX() + 1);
+if (aPoint.getY() - rPreviousPoint.getX() == 0)
+aPoint.setY(aPoint.getY() + 1);
+}
+
 if (bIsWriter && bInGroup)
 // Writer's draw page is in twips, and these points get passed
 // to core without any unit conversion when Writer
diff --git a/sw/qa/extras/ooxmlimport/data/tdf96674.docx 
b/sw/qa/extras/ooxmlimport/data/tdf96674.docx
new file mode 100644
index 000..752479c
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf96674.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 87435f5..043f7f4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2859,6 +2859,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf78902, "tdf78902.docx")
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx")
+{
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape.is());
+awt::Size aActualSize(xShape->getSize());
+// This was 3493: the vertical line was horizontal.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aActualSize.Width);
+CPPUNIT_ASSERT(aActualSize.Height > 0);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - helpcontent2

2016-01-11 Thread Eike Rathke

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

New commits:
commit 4c3c050f09eab2ef566d0fdd7f88b6684ceee42c
Author: Eike Rathke 
Date:   Fri Jan 8 11:24:40 2016 +0100

Updated core
Project: help  c1ceff53b1e8f453a4451616a1ddcb49460dfca6

tdf#85433 help content for WEEKNUM, ISOWEEKNUM, WEEKNUM_EXCEL2003, 
WEEKNUM_OOO

Change-Id: I92995b4de6fe18d981757f0d273ddce5c11b1559
(cherry picked from commit 71a3f0e66fb6fb37f73fe3841a36ba00bec5beaa)
Reviewed-on: https://gerrit.libreoffice.org/21248
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/helpcontent2 b/helpcontent2
index 0cf317c..c1ceff5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0cf317ca3a91d1cc87b8079f10a05db1a01d3548
+Subproject commit c1ceff53b1e8f453a4451616a1ddcb49460dfca6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-5-1' - AllLangHelp_scalc.mk source/text

2016-01-11 Thread Eike Rathke

 AllLangHelp_scalc.mk  |2 +
 source/text/scalc/01/04060102.xhp |   12 ++-
 source/text/scalc/01/func_isoweeknum.xhp  |   46 +++
 source/text/scalc/01/func_weeknum.xhp |   29 -
 source/text/scalc/01/func_weeknum_ooo.xhp |   51 ++
 source/text/scalc/01/func_weeknumadd.xhp  |   14 
 6 files changed, 138 insertions(+), 16 deletions(-)

New commits:
commit c1ceff53b1e8f453a4451616a1ddcb49460dfca6
Author: Eike Rathke 
Date:   Fri Jan 8 11:24:40 2016 +0100

tdf#85433 help content for WEEKNUM, ISOWEEKNUM, WEEKNUM_EXCEL2003, 
WEEKNUM_OOO

Change-Id: I92995b4de6fe18d981757f0d273ddce5c11b1559
(cherry picked from commit 71a3f0e66fb6fb37f73fe3841a36ba00bec5beaa)
Reviewed-on: https://gerrit.libreoffice.org/21248
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 975c527..efce395 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -207,6 +207,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_imsin \
 helpcontent2/source/text/scalc/01/func_imsinh \
 helpcontent2/source/text/scalc/01/func_imtan \
+helpcontent2/source/text/scalc/01/func_isoweeknum \
 helpcontent2/source/text/scalc/01/func_minute \
 helpcontent2/source/text/scalc/01/func_month \
 helpcontent2/source/text/scalc/01/func_networkdays \
@@ -220,6 +221,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_weekday \
 helpcontent2/source/text/scalc/01/func_webservice \
 helpcontent2/source/text/scalc/01/func_weeknum \
+helpcontent2/source/text/scalc/01/func_weeknum_ooo \
 helpcontent2/source/text/scalc/01/func_weeknumadd \
 helpcontent2/source/text/scalc/01/func_workday \
 helpcontent2/source/text/scalc/01/func_year \
diff --git a/source/text/scalc/01/04060102.xhp 
b/source/text/scalc/01/04060102.xhp
index db41ffd..9ff462d 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -38,7 +38,7 @@
 
 
 
-The 
functions whose names end with _ADD return the same results as the 
corresponding Microsoft Excel functions. Use the functions without _ADD to get 
results based on international standards. For example, the WEEKNUM function 
calculates the week number of a given date based on international standard ISO 
8601, while WEEKNUM_ADD returns the same week number as Microsoft 
Excel.UFI: see #33784#
+The 
functions whose names end with _ADD or _EXCEL2003 return the same results as 
the corresponding Microsoft Excel 2003 functions without the suffix. Use the 
functions without suffix to get results based on international 
standards.
 
 $[officename] internally handles a date/time value as a numerical 
value. If you assign the numbering format "Number" to a date or time value, it 
is converted to a number. For example, 01/01/2000 12:00 PM, converts to 
36526.5. The value preceding the decimal point corresponds to the date; the 
value following the decimal point corresponds to the time. If you do not want 
to see this type of numerical date or time representation, change the number 
format (date or time) accordingly. To do this, select the cell containing the 
date or time value, call its context menu and select Format Cells. 
The Numbers tab page contains the functions for defining the 
number format.
 Date base for day zero
@@ -130,11 +130,21 @@

 
 
+
+
+   
+
+
 
 

 
 
+
+
+   
+
+
 
 

diff --git a/source/text/scalc/01/func_isoweeknum.xhp 
b/source/text/scalc/01/func_isoweeknum.xhp
new file mode 100644
index 000..3e283be
--- /dev/null
+++ b/source/text/scalc/01/func_isoweeknum.xhp
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+   
+
+
+ISOWEEKNUM
+/text/scalc/01/func_isoweeknum.xhp
+
+
+
+ISOWEEKNUM function
+
+ISOWEEKNUM
+
+ISOWEEKNUM calculates the week 
number of the year for the internal date value.
+The 
International Standard ISO 8601 has decreed that Monday shall be the first day 
of the week. A week that lies partly in one year and partly in another is 
assigned a number in the year in which most of its days lie. That means that 
week number 1 of any year is the week that contains the January 4th.
+Syntax
+ISOWEEKNUM(Number)
+
+Number is the internal date number.
+Examples
+=ISOWEEKNUM(DATE(1995;1;1)) returns 52. Week 1 starts on Monday, 
1995-01-02.
+=ISOWEEKNUM(DATE(1999;1;1)) returns 53. Week 1 starts on Monday, 
1999-01-04.
+
+
diff --git a/source/text/scalc/01/func_weeknum.xhp 
b/source/text/scalc/01/func_weeknum.xhp
index 58d1f93..a19848f 100644
--- a/source/text/scalc/01/func_weeknum.xhp
+++ b/source/text/scalc/01/func_weeknum.xhp
@@ -33,18 +33,31 @@
 
 WEEKNUM
 
-WEEKNUM calculates the week 
number of the year for the internal date value.
-The 
International Standard ISO 8601 has decreed that Monday shall be the first day 
of the w

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

2016-01-11 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/tdf92045.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5e7f23292d8c67a65b86e6273b38e8310431ae20
Author: Miklos Vajna 
Date:   Wed Jan 6 08:23:20 2016 +0100

tdf#92045 DOCX import:  doesn't mean blinking

Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use
constants for ST_TextEffect values, 2014-09-22), the problem was that
while the tokenizer stopped using hardcoded token values, the matching
dmapper code wasn't adapted.

(cherry picked from commit ac6bfd85df271b650dbd24b45391dac346ecd72c)

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf92045.docx 
b/sw/qa/extras/ooxmlimport/data/tdf92045.docx
new file mode 100644
index 000..d41f523
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf92045.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cfdbd7b5..ab8dabe 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3012,6 +3012,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx")
 CPPUNIT_ASSERT(aActualSize.Height > 0);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx")
+{
+// This was true,  resulted in setting the 
blinking font effect.
+CPPUNIT_ASSERT_EQUAL(false, getProperty(getRun(getParagraph(1), 1), 
"CharFlash"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 07350c9..6d7eb17 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1633,7 +1633,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 case NS_ooxml::LN_EG_RPrBase_effect:
 // The file-format has many character animations. We have only
 // one, so we use it always. Suboptimal solution though.
-if (nIntValue)
+if (nIntValue != NS_ooxml::LN_Value_ST_TextEffect_none)
 rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true ));
 else
 rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Lionel Elie Mamane

 svx/source/fmcomp/fmgridif.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3408d37aed9d494e1401417a9344012a54ebdfd8
Author: Lionel Elie Mamane 
Date:   Mon Jan 11 12:17:38 2016 +0100

tdf#96482 Revert "tdf#94069 call setVisible when setDesignMode is called"

This reverts commit a7816853bad55ada597092c16ba9a0a761e067d0.

tdf#94069 (freeze) has been corrected differently in libreoffice-5-1 anyway.

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

diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 12adb13..041825e 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1692,8 +1692,6 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( 
RuntimeException, std::exce
 static_cast(pWin)->SetDesignMode(bOn);
 }
 
-setVisible(!bOn);
-
 if (bOn)
 DisConnectFromDispatcher();
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Laurent Balland-Poirier

 xmloff/source/style/xmlnumfe.cxx |   16 ++--
 xmloff/source/style/xmlnumfi.cxx |   19 +--
 2 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit 3ee66e306cf0ca9c2b56de26c28e8130d7b72f64
Author: Laurent Balland-Poirier 
Date:   Wed Dec 30 23:32:15 2015 +0100

tdf#40517 Export/Import in ODF decimal replacement with space

Number format such as "0.???" is saved in ODF with 
number:decimal-replacement=" "

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

diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 7f8a33e..3070831 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1178,6 +1178,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 bool bCurrFound  = false;
 bool bInInteger  = true;
 bool bExpSign = true;
+bool bDecAlign   = false;   // decimal alignment with "?"
 sal_Int32 nExpDigits = 0;
 sal_Int32 nIntegerSymbols = 0;  // for embedded-text, 
including "#"
 sal_Int32 nTrailingThousands = 0;   // thousands-separators after 
all digits
@@ -1206,9 +1207,17 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 }
 else if ( !bInInteger && pElemStr )
 {
-for ( sal_Int32 i = pElemStr->getLength()-1; i >= 0 && 
(*pElemStr)[i] == '#'; i-- )
+for ( sal_Int32 i = pElemStr->getLength()-1; i >= 0 ; 
i-- )
 {
-nMinDecimals --;
+sal_Unicode aChar = (*pElemStr)[i];
+if ( aChar == '#' || aChar == '?' )
+{
+nMinDecimals --;
+if ( aChar == '?' )
+bDecAlign = true;
+}
+else
+break;
 }
 }
 if ( bInInteger && pElemStr )
@@ -1428,6 +1437,9 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 OUStringBuffer sDashStr;
 if (bDecDashes && nPrecision > 0)
 
comphelper::string::padToLength(sDashStr, nPrecision, '-');
+// "?" in decimal part are replaced by 
space character
+if (bDecAlign && nPrecision > 0)
+sDashStr = " ";
 
 WriteNumberElement_Impl(nDecimals, 
nMinDecimals, nInteger, sDashStr.makeStringAndClear(),
 bThousand, nTrailingThousands, 
aEmbeddedEntries);
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index b4a79ea..8200fd0 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -102,6 +102,7 @@ struct SvXMLNumberInfo
 boolbGrouping;
 boolbDecReplace;
 boolbExpSign;
+boolbDecAlign;
 double  fDisplayFactor;
 std::map m_EmbeddedElements;
 
@@ -109,7 +110,7 @@ struct SvXMLNumberInfo
 {
 nDecimals = nInteger = nExpDigits = nExpInterval = nNumerDigits = 
nDenomDigits =
 nFracDenominator = nMinDecimalDigits = -1;
-bGrouping = bDecReplace = false;
+bGrouping = bDecReplace = bDecAlign = false;
 bExpSign = true;
 fDisplayFactor = 1.0;
 }
@@ -940,10 +941,16 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( 
SvXMLImport& rImport,
 aNumInfo.fDisplayFactor = fAttrDouble;
 break;
 case XML_TOK_ELEM_ATTR_DECIMAL_REPLACEMENT:
-if ( !sValue.isEmpty() )
-aNumInfo.bDecReplace = true;// only a default string 
is supported
+if ( sValue == " " )
+{
+aNumInfo.bDecAlign = true; // space replacement for "?"
+bVarDecimals = true;
+}
 else
-bVarDecimals = true;   // empty replacement string: 
variable decimals
+if ( sValue.isEmpty() )
+bVarDecimals = true;   // empty replacement string: 
variable decimals
+else// all other strings
+aNumInfo.bDecReplace = true;// decimal replacement 
with dashes
 break;
 case XML_TOK_ELEM_ATTR_MIN_EXPONENT_DIGITS:
 if (::sax::Converter::convertNumbe

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

2016-01-11 Thread Stephan Bergmann

 sfx2/inc/bitset.hxx   |  126 ++--
 sfx2/source/bastyp/bitset.cxx |  215 +-
 2 files changed, 20 insertions(+), 321 deletions(-)

New commits:
commit 753b516cae68a5ac09c6389b9e8cd8a52e40ae11
Author: Stephan Bergmann 
Date:   Mon Jan 11 14:33:00 2016 +0100

Merge BitSet into IndexBitSet (and remove unused parts)

Change-Id: I8cab0aac2f67b88936e4bed459dd43b08429b136

diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 67651e1..d3f3b28 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -19,131 +19,27 @@
 #ifndef INCLUDED_SFX2_INC_BITSET_HXX
 #define INCLUDED_SFX2_INC_BITSET_HXX
 
-class BitSet
+class IndexBitSet
 {
 private:
-void CopyFrom( const BitSet& rSet );
 sal_uInt16 nBlocks;
 sal_uInt16 nCount;
 sal_uInt32* pBitmap;
-public:
-BitSet operator<<( sal_uInt16 nOffset ) const;
-BitSet operator>>( sal_uInt16 nOffset ) const;
-static sal_uInt16 CountBits(sal_uInt32 nBits);
-bool operator!() const;
-BitSet();
-BitSet( const BitSet& rOrig );
-~BitSet();
-BitSet& operator=( const BitSet& rOrig );
-BitSet& operator=( sal_uInt16 nBit );
-BitSet operator|( const BitSet& rSet ) const;
-BitSet operator|( sal_uInt16 nBit ) const;
-BitSet& operator|=( const BitSet& rSet );
-BitSet& operator|=( sal_uInt16 nBit );
-BitSet operator-( const BitSet& rSet ) const;
-BitSet operator-( sal_uInt16 nId ) const;
-BitSet& operator-=( const BitSet& rSet );
-BitSet& operator-=( sal_uInt16 nBit );
-BitSet operator&( const BitSet& rSet ) const;
-BitSet& operator&=( const BitSet& rSet );
-BitSet operator^( const BitSet& rSet ) const;
-BitSet operator^( sal_uInt16 nBit ) const;
-BitSet& operator^=( const BitSet& rSet );
-BitSet& operator^=( sal_uInt16 nBit );
-bool Contains( sal_uInt16 nBit ) const;
-bool operator==( const BitSet& rSet ) const;
-bool operator!=( const BitSet& rSet ) const;
 
-};
-
-// returns sal_True if the set is empty
-inline bool BitSet::operator!() const
-{
-return nCount == 0;
-}
-
-// creates the union of two bitset
-inline BitSet BitSet::operator|( const BitSet& rSet ) const
-{
-return BitSet(*this) |= rSet;
-}
-
-// creates the union of a bitset with a single bit
-inline BitSet BitSet::operator|( sal_uInt16 nBit ) const
-{
-return BitSet(*this) |= nBit;
-}
-
-// creates the asymetric difference
-inline BitSet BitSet::operator-( const BitSet& ) const
-{
-return BitSet();
-}
-
-// creates the asymetric difference with a single bit
-inline BitSet BitSet::operator-( sal_uInt16 ) const
-{
-return BitSet();
-}
-
-// removes the bits contained in rSet
-inline BitSet& BitSet::operator-=( const BitSet& )
-{
-return *this;
-}
-
-// creates the intersection with another bitset
-inline BitSet BitSet::operator&( const BitSet& ) const
-{
-return BitSet();
-}
-
-// intersects with another bitset
-inline BitSet& BitSet::operator&=( const BitSet& )
-{
-return *this;
-}
-
-// creates the symetric difference with another bitset
-inline BitSet BitSet::operator^( const BitSet& ) const
-{
-return BitSet();
-}
-
-// creates the symetric difference with a single bit
-inline BitSet BitSet::operator^( sal_uInt16 ) const
-{
-return BitSet();
-}
-
-// builds the symetric difference with another bitset
-inline BitSet& BitSet::operator^=( const BitSet& )
-{
-return *this;
-}
-
-#ifdef BITSET_READY
-// builds the symetric difference with a single bit
-inline BitSet& BitSet::operator^=( sal_uInt16 )
-{
-// crash!!!
-return BitSet();
-}
-#endif
+IndexBitSet& operator|=( sal_uInt16 nBit );
+IndexBitSet& operator-=( sal_uInt16 nBit );
+bool Contains( sal_uInt16 nBit ) const;
 
-// determines if the bitsets aren't equal
-inline bool BitSet::operator!=( const BitSet& rSet ) const
-{
-return !( *this == rSet );
-}
+IndexBitSet(IndexBitSet &) = delete;
+void operator =(IndexBitSet) = delete;
 
-class IndexBitSet : private BitSet
-{
 public:
-  sal_uInt16 GetFreeIndex();
-  void ReleaseIndex(sal_uInt16 i){*this-=i;}
-};
+IndexBitSet();
+~IndexBitSet();
 
+sal_uInt16 GetFreeIndex();
+void ReleaseIndex(sal_uInt16 i){*this-=i;}
+};
 
 #endif
 
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index c36de49..39cba96 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -23,151 +23,10 @@
 
 #include 
 #include 
-#include 
-
-
-// add nOffset to each bit-value in the set
-
-BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
-{
-// create a work-copy, return it if nothing to shift
-BitSet aSet(*this);
-if ( nOffset == 0 )
-return aSet;
-
-// compute the shiftment in long-words and bits
-sal_uInt16 nBlockDiff = nOffset / 32;
-sal_uInt32 nBitValDiff = nOffset % 32;
-
-// compute the new number of bits
-for ( sal_uInt16 nBlock = 0; nBlock < nBlockDiff; ++nBloc

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

2016-01-11 Thread Stephan Bergmann

 extensions/source/scanner/sane.hxx|8 +---
 extensions/source/scanner/scanunx.cxx |   11 ---
 2 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 9d4bfc6162e1627f7bfe82f98a4ba4916296f5dd
Author: Stephan Bergmann 
Date:   Mon Jan 11 14:37:03 2016 +0100

Use WeakImplHelper

Change-Id: Iee4aec239bf095233aac800f70688ad9db7949df

diff --git a/extensions/source/scanner/sane.hxx 
b/extensions/source/scanner/sane.hxx
index 504ede7..b96e89c 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -29,7 +29,7 @@
 // - BitmapTransporter -
 
 
-class BitmapTransporter : public OWeakObject, public css::awt::XBitmap
+class BitmapTransporter: public cppu::WeakImplHelper
 {
 SvMemoryStream  m_aStream;
 osl::Mutex  m_aProtector;
@@ -39,12 +39,6 @@ public:
 BitmapTransporter();
 virtual ~BitmapTransporter();
 
-
-// XInterface
-virtual Any SAL_CALLqueryInterface( const Type & rType ) 
throw( RuntimeException, std::exception ) override;
-virtual void SAL_CALL   acquire() throw() override { 
OWeakObject::acquire(); }
-virtual void SAL_CALL   release() throw() override { 
OWeakObject::release(); }
-
 virtual css::awt::Size SAL_CALL  getSize() throw(std::exception) 
override;
 virtual Sequence< sal_Int8 > SAL_CALLgetDIB() throw(std::exception) 
override;
 virtual Sequence< sal_Int8 > SAL_CALLgetMaskDIB() 
throw(std::exception) override { return Sequence< sal_Int8 >(); }
diff --git a/extensions/source/scanner/scanunx.cxx 
b/extensions/source/scanner/scanunx.cxx
index f43d2b4..aae2b25 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -41,17 +41,6 @@ BitmapTransporter::~BitmapTransporter()
 #endif
 }
 
-
-
-Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( 
RuntimeException, std::exception )
-{
-const Any aRet( cppu::queryInterface( rType, static_cast< 
css::awt::XBitmap* >( this ) ) );
-
-return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) );
-}
-
-
-
 css::awt::Size BitmapTransporter::getSize() throw(std::exception)
 {
 osl::MutexGuard aGuard( m_aProtector );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/source

2016-01-11 Thread Pranav Kant

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

New commits:
commit 1673606de9a520e615e1a32da94f28d55ebaea20
Author: Pranav Kant 
Date:   Sun Jan 10 22:50:46 2016 +0530

lokdocview: Use shared_ptr to fix a possible memory leak

Possible because boost::property_tree can throw an exception.

Change-Id: I68394ce3b30d448d40d8e22555bafdff1ffa6092
Reviewed-on: https://gerrit.libreoffice.org/21309
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 02b49890d51ec463d32846f1108344159664a9eb)
Reviewed-on: https://gerrit.libreoffice.org/21345
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index d091bb9..58747a5 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -344,13 +345,12 @@ doSearch(LOKDocView* pDocView, const char* pText, bool 
bBackwards, bool highligh
 boost::property_tree::ptree aTree;
 GtkWidget* drawingWidget = GTK_WIDGET(pDocView);
 GdkWindow* drawingWindow = gtk_widget_get_window(drawingWidget);
-cairo_region_t* cairoVisRegion = 
gdk_window_get_visible_region(drawingWindow);
+std::shared_ptr cairoVisRegion( 
gdk_window_get_visible_region(drawingWindow),
+cairo_region_destroy);
 cairo_rectangle_int_t cairoVisRect;
-int x, y;
-
-cairo_region_get_rectangle(cairoVisRegion, 0, &cairoVisRect);
-x = pixelToTwip (cairoVisRect.x, priv->m_fZoom);
-y = pixelToTwip (cairoVisRect.y, priv->m_fZoom);
+cairo_region_get_rectangle(cairoVisRegion.get(), 0, &cairoVisRect);
+int x = pixelToTwip (cairoVisRect.x, priv->m_fZoom);
+int y = pixelToTwip (cairoVisRect.y, priv->m_fZoom);
 
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchString/type",
 '/'), "string");
 
aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchString/value",
 '/'), pText);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Miklos Vajna

 sw/qa/extras/uiwriter/uiwriter.cxx |   26 ++
 sw/source/core/layout/calcmove.cxx |3 ++-
 sw/source/core/layout/wsfrm.cxx|   15 +++
 3 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit d3584878aee1bee36e9cc18e58a75dbc95b3e283
Author: Miklos Vajna 
Date:   Wed Dec 16 15:41:38 2015 +0100

tdf#96536 sw Hide Whitespace: shrink oversized page frames on para delete

The body frame did get a request to shrink, but because it had fixed
size, nothing happened. Trigger a recalc that does the right thing wrt.
hidden whitespace.

(cherry picked from commits 72f0067258fd7738217abd43452abe282e05c11b and
af47b54d49355a003deda722b5d0112a7b746485)

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

Change-Id: I446978da8b33372c2ab30200b45b1bcec1dea7a0
Reviewed-on: https://gerrit.libreoffice.org/21084
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index a31dc51..eea54df 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -174,6 +174,7 @@ public:
 void testTdf92648();
 void testTdf96515();
 void testTdf96479();
+void testTdf96536();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -256,6 +257,7 @@ public:
 CPPUNIT_TEST(testTdf92648);
 CPPUNIT_TEST(testTdf96515);
 CPPUNIT_TEST(testTdf96479);
+CPPUNIT_TEST(testTdf96536);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3001,6 +3003,30 @@ void SwUiWriterTest::testTdf96479()
 }
 }
 
+void SwUiWriterTest::testTdf96536()
+{
+// Enable hide whitespace mode.
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SwViewOption aViewOptions(*pWrtShell->GetViewOptions());
+aViewOptions.SetHideWhitespaceMode(true);
+pWrtShell->ApplyViewOptions(aViewOptions);
+
+// Insert a new paragraph at the end of the document, and then delete it.
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xParagraphAppend(xTextDocument->getText(), uno::UNO_QUERY);
+xParagraphAppend->finishParagraph(uno::Sequence());
+calcLayout();
+uno::Reference xParagraph(getParagraph(2), 
uno::UNO_QUERY);
+xParagraph->dispose();
+calcLayout();
+
+// This was 552, page did not shrink after deleting the second paragraph.
+// Expected 276, which is 12pt font size + default line spacing (15%), but
+// tolerate some difference to that.
+CPPUNIT_ASSERT(parseDump("/root/infos/bounds", "height").toInt32() <= 276);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 9220417..21d479a 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1522,7 +1522,8 @@ void SwContentFrame::MakeAll(vcl::RenderContext* 
/*pRenderContext*/)
 const long nPrtBottom = (GetUpper()->*fnRect->fnGetPrtBottom)();
 long nBottomDist = (Frame().*fnRect->fnBottomDist)(nPrtBottom);
 
-if 
(getRootFrame()->GetCurrShell()->GetViewOptions()->IsWhitespaceHidden())
+SwViewShell* pShell = getRootFrame()->GetCurrShell();
+if (pShell && pShell->GetViewOptions()->IsWhitespaceHidden())
 {
 // When whitespace is hidden, the page frame has two heights: the
 // nominal (defined by the frame format), and the actual (which is
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index edd660d..0f60476 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2358,6 +2358,21 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool 
bTst, bool bInfo )
 const SwViewShell *pSh = getRootFrame()->GetCurrShell();
 const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
 const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse 
by Body.
+
+if (pSh && pSh->GetViewOptions()->IsWhitespaceHidden())
+{
+if (IsBodyFrame())
+{
+// Whitespace is hidden and this body frame will not shrink, as it
+// has a fix size.
+// Invalidate the page frame size, so in case the reason for the
+// shrink was that there is more whitespace on this page, the size
+// without whitespace will be recalculated correctly.
+SwPageFrame* pPageFrame = FindPageFrame();
+pPageFrame->InvalidateSize();
+}
+}
+
 if( !(GetType() & nTmpType) && HasFixSize() )
 return 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/mm-cleanup' - 200 commits - accessibility/inc accessibility/source android/source avmedia/source basctl/source basic/source bin/update_pch bin/upda

2016-01-11 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit 694a25cb100f1233ee8667a97f4d2a1c942a0d4a
Author: Jan-Marek Glogowski 
Date:   Mon Jan 11 13:49:30 2016 +0100

MM: cleanup of comments and asserts

Also adds a README to explain some of the code flow of MM.

Change-Id: I363fdd73824a8d41f7073b6de2e9c24184005397

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 5c8dce6..e900af0 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -144,32 +144,65 @@ struct SwMergeDescriptor
 {
 const DBManagerOptions  nMergeType;
 SwWrtShell& rSh;
-const svx::ODataAccessDescriptor& rDescriptor;
-OUStringsSaveToFilter; ///< 
export filter to save resulting files
+const svx::ODataAccessDescriptor&   rDescriptor;
+
+/**
+ * Create a single or multiple results
+ *
+ * This currently just affects FILE and PRINTER, as EMAIL is always
+ * multiple and SHELL is always single.
+ */
+boolbCreateSingleFile;
+
+/**
+ * @defgroup save Export filter settings
+ * @addtogroup save
+ * @{ */
+OUStringsSaveToFilter;
 OUStringsSaveToFilterOptions;
 css::uno::Sequence< css::beans::PropertyValue > aSaveToFilterData;
+/** @} */
 
+/**
+ * @defgroup file Mail merge as File settings
+ * @addtogroup file
+ * @{ */
 OUStringsPath;
+/** @} */
 
+/**
+ * @defgroup email Mail merge as eMail settings
+ * @addtogroup email
+ * @{ */
 OUStringsSubject;
 OUStringsMailBody;
 OUStringsAttachmentName;
 css::uno::Sequence< OUString >  aCopiesTo;
 css::uno::Sequence< OUString >  aBlindCopiesTo;
-
 css::uno::Reference< css::mail::XSmtpService >  xSmtpServer;
+boolbSendAsHTML;
+boolbSendAsAttachment;
+/** @} */
 
-boolbSendAsHTML;
-boolbSendAsAttachment;
-
-boolbPrintAsync;
-boolbCreateSingleFile;
+/**
+ * @addtogroup file email
+ * @{ */
 
+/** DB column to fetch EMail of Filename from
+ */
 OUStringsDBcolumn;
 
-SwMailMergeConfigItem*  pMailMergeConfigItem;
+/** @} */
 
-css::uno::Sequence<  css::beans::PropertyValue >  aPrintOptions;
+/**
+ * @defgroup print Mail merge to Printer
+ * @addtogroup print
+ * @{ */
+boolbPrintAsync;
+css::uno::Sequence<  css::beans::PropertyValue >aPrintOptions;
+/** @} */
+
+SwMailMergeConfigItem*  pMailMergeConfigItem;
 
 SwMergeDescriptor( const DBManagerOptions nType,
SwWrtShell& rShell,
@@ -177,11 +210,11 @@ struct SwMergeDescriptor
 nMergeType(nType),
 rSh(rShell),
 rDescriptor(rDesc),
+bCreateSingleFile( false ),
 bSendAsHTML( true ),
 bSendAsAttachment( false ),
 bPrintAsync( false ),
-bCreateSingleFile( false ),
-pMailMergeConfigItem(nullptr)
+pMailMergeConfigItem( nullptr )
 {
 if( nType == DBMGR_MERGE_SHELL )
 bCreateSingleFile = true;
@@ -197,7 +230,14 @@ class SW_DLLPUBLIC SwDBManager
 {
 friend class SwConnectionDisposedListener_Impl;
 
-boolm_bCancel;///< Mail merge canceled.
+/** Mail merge cancel indicator
+
+   TODO: convert m_bCancel to a three state escalating enum
+   run, cancel, error. Not sure if this helps readability /
+   further code cleanup, but it would be easier to follow the
+   seamantics and we could get rid of bNoError in MergeMailFiles
+ */
+boolm_bCancel;
 boolbInitDBFields : 1;
 boolbInMerge: 1;///< merge process active
 boolbMergeSilent : 1;   ///< suppress display of dialogs/boxes 
(used when called over API)
@@ -223,7 +263,7 @@ friend class SwConnectionDisposedListener_Impl;
 /// Insert a single data record as text into document.
 SAL_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
 
-/// merge to file _and_ merge to e-Mail
+/// Run the mail merge for defined modes, except DBMGR_MERGE
 SAL_DLLPRIVATE bool MergeMailFiles( SwWrtShell* pSh,

[Libreoffice-commits] core.git: 2 commits - xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/inc xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/qa

2016-01-11 Thread Miklos Vajna

 xmlsecurity/CppunitTest_xmlsecurity_signing.mk  |   45 +++
 xmlsecurity/Library_xmlsecurity.mk  |4 
 xmlsecurity/Module_xmlsecurity.mk   |4 
 xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx |3 
 xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx  |3 
 xmlsecurity/inc/xmlsecuritydllapi.h |   23 +
 xmlsecurity/qa/unit/signing/data/certificate.crt|   27 ++
 xmlsecurity/qa/unit/signing/signing.cxx |  196 
 8 files changed, 303 insertions(+), 2 deletions(-)

New commits:
commit 5322c76a52cc08cf6b25668076704b67c9a0a663
Author: Miklos Vajna 
Date:   Mon Jan 11 15:46:10 2016 +0100

xmlsecurity: initial CppunitTest_xmlsecurity_signing

Fails with either commit 88cbfe58c4a36c20bdb2445f43043f0a5a006ee3's last
hunk to xsecctl.cxx (export) or commit
a968893e6afd3b79c6c048962373859cea75a77b's last hunk to xsecparser.cxx
(import) reverted.

Change-Id: I0f303c8489f451ebf175ed836d3679b6a13aca42

diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
new file mode 100644
index 000..f0cec56
--- /dev/null
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_signing))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_signing, \
+   xmlsecurity/qa/unit/signing/signing \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_signing, \
+   comphelper \
+   cppu \
+   sal \
+   sax \
+   test \
+   tl \
+   unotest \
+   utl \
+   xmlsecurity \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,xmlsecurity_signing,\
+   -I$(SRCDIR)/xmlsecurity/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,xmlsecurity_signing))
+
+$(eval $(call gb_CppunitTest_use_ure,xmlsecurity_signing))
+$(eval $(call gb_CppunitTest_use_vcl,xmlsecurity_signing))
+
+$(eval $(call gb_CppunitTest_use_rdb,xmlsecurity_signing,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_signing))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index b4f2646..f5fb0ca 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
$(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
+CppunitTest_xmlsecurity_signing \
+))
+
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
AllLangResTarget_xsec \
UIConfig_xmlsec \
diff --git a/xmlsecurity/qa/unit/signing/data/certificate.crt 
b/xmlsecurity/qa/unit/signing/data/certificate.crt
new file mode 100644
index 000..f3f34b7
--- /dev/null
+++ b/xmlsecurity/qa/unit/signing/data/certificate.crt
@@ -0,0 +1,27 @@
+MIIE7jCCAtagAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwVzELMAkGA1UEBhMCVUsx
+EDAOBgNVBAgMB0VuZ2xhbmQxEjAQBgNVBAoMCVRTQ1AgVGVzdDEiMCAGA1UEAwwZ
+VFNDUCBJbnRlcm1lZGlhdGUgUm9vdCBDQTAeFw0xNTEyMTgwNzU4MTlaFw0xNjEy
+MjcwNzU4MTlaMFUxCzAJBgNVBAYTAlVLMRAwDgYDVQQIDAdFbmdsYW5kMRIwEAYD
+VQQKDAlUU0NQIFRlc3QxIDAeBgNVBAMMF1RTQ1AgVGVzdCBleGFtcGxlIEFsaWNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3m2YNdX+nc1LkhlrNrcI
+PI3yCWnv0/0k9zDKpKiwjMH4vjWM46M6ptAiupxVpAMW5ojnhEyxaNHvZNsCwddY
+E6778hut2SJvz0szSBuHUuedcALI2EhVwdM0yLqfGo6WGeOIBDId49TemdNCMhk2
+zOpb1BqYhKls0LfdbxT/an3JaDmmLhPjvgYMJNYVX86L199OQFLJ1zLqQ0YirkKq
+XL9cSPmyYBKjgnqQ4Z5YfPL63EP0TsEfa5oQmy/0gS5FB2Wz9CqIptB130v0GR4X
+ObTpOkhPFfC5RDBFTMZoi4NCK10wn2NCbr7qZ3aMrOlfeKbsNIifwu0KYFHXyxL5
+AwIDAQABo4HFMIHCMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgWgMDMGCWCG
+SAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBDbGllbnQgQ2VydGlmaWNhdGUw
+HQYDVR0OBBYEFCL6DzsuAbni8475Z+HkX5tv8iiWMB8GA1UdIwQYMBaAFMuejS1r
+WjUf3x1+2QbPSVpuXFl+MA4GA1UdDwEB/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggIBAFs0DeCDjttHQ0UHsYcn
+hfBCWRdOFdIr3F/IEbN2BL/grScGXoXRaYMIQJv/s5dKgZIuH7xMCVKazoftPVqU
+4bOEduAv0IJ6hQF/wEMBueA0UjvQQVYZgsOALi7TD3gYpFqYcH2Wfx5/5Ln6dllL
+8UsHoP+6gSLaYwjJd7FQ+IlNTzR65dRMLoJhoKqqyuM6cf/PM8sbK2NH2r8toypj
+fPixvD/w3wP7xn4oo/IGXcRK4DTHBF/rSMqeR6ePwXm5tVHrQBfnxN3dsGsXkQgq
+zBvvbPY0raraO4CPR7mZp4GVFHOsUNh5TI1SlfxWZ49HU3F5jWeiI9jPuw1RmuAy
+ZdFEt403Wi67v6revXe1By6UqIZjq3b2pJGBKZH+60P1cJScawzrN8pi1qQFV8Ji
+iJM6/MSciqplTT5F7SG0XZx1CjnBz5rMdYNhI9NN

[Libreoffice-commits] core.git: xmlsecurity/CppunitTest_xmlsecurity_signing.mk

2016-01-11 Thread Miklos Vajna

 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6363492a509c1c5b1ab526b604a99aac7279ed73
Author: Miklos Vajna 
Date:   Mon Jan 11 15:49:44 2016 +0100

xmlsecurity: missing boost dependency

Change-Id: Ida3a34fb74e4f956f865c8a52bdcf63811e290cc

diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index f0cec56..9cfa476 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -28,6 +28,10 @@ $(eval $(call 
gb_CppunitTest_use_libraries,xmlsecurity_signing, \
$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\
+boost_headers \
+))
+
 $(eval $(call gb_CppunitTest_set_include,xmlsecurity_signing,\
-I$(SRCDIR)/xmlsecurity/inc \
$$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/Module_xmlsecurity.mk

2016-01-11 Thread Miklos Vajna

 xmlsecurity/Module_xmlsecurity.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d76b4682aa6d75b5c6b2de19b0bb18181a99e9bc
Author: Miklos Vajna 
Date:   Mon Jan 11 16:28:48 2016 +0100

CppunitTest_xmlsecurity_signing: disable on Windows for now

Change-Id: Icc0d11cfe421d6328739211511379a39195436b9

diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index f5fb0ca..beea26b 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -15,9 +15,12 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
$(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
 ))
 
+# FIXME find out what's the proper fix to get this linked on Windows
+ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
 CppunitTest_xmlsecurity_signing \
 ))
+endif
 
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
AllLangResTarget_xsec \
___
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-7' - loleaflet/src

2016-01-11 Thread Jan Holesovsky

 loleaflet/src/map/Map.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34dcc7c3caffd733e6c19331a4ab9c6eee2c61cc
Author: Jan Holesovsky 
Date:   Mon Jan 11 16:41:30 2016 +0100

loleaflet: Don't crash on map.remove() when the underlying DOM is gone.

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6692485..f7c93c8 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -601,7 +601,7 @@ L.Map = L.Evented.extend({
'mouseover mouseout mousemove contextmenu keydown 
keypress keyup trplclick qdrplclick', this._handleDOMEvent, this);
L.DomEvent[onOff](this._textArea, 'copy paste keydown keypress 
keyup', this._handleDOMEvent, this);
 
-   if (this.options.trackResize) {
+   if (this.options.trackResize && 
this._resizeDetector.contentWindow) {
L.DomEvent[onOff](this._resizeDetector.contentWindow, 
'resize', this._onResize, this);
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Jan Holesovsky

 loleaflet/src/map/Map.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aca8d673b2378e1a224e417fc84ca00058a56642
Author: Jan Holesovsky 
Date:   Mon Jan 11 16:41:30 2016 +0100

loleaflet: Don't crash on map.remove() when the underlying DOM is gone.

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6692485..f7c93c8 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -601,7 +601,7 @@ L.Map = L.Evented.extend({
'mouseover mouseout mousemove contextmenu keydown 
keypress keyup trplclick qdrplclick', this._handleDOMEvent, this);
L.DomEvent[onOff](this._textArea, 'copy paste keydown keypress 
keyup', this._handleDOMEvent, this);
 
-   if (this.options.trackResize) {
+   if (this.options.trackResize && 
this._resizeDetector.contentWindow) {
L.DomEvent[onOff](this._resizeDetector.contentWindow, 
'resize', this._onResize, this);
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - libreofficekit/source

2016-01-11 Thread Pranav Kant

 libreofficekit/source/gtk/lokdocview.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0056a61e17e0d8faf314431c701c00c3b6c8d5f9
Author: Pranav Kant 
Date:   Fri Dec 18 22:42:53 2015 +0530

tdf#96421: Return if no window is realized

Change-Id: I13de7e6eae4e73932e8441ba2e2ad3e4ff888f41
Reviewed-on: https://gerrit.libreoffice.org/20799
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 4200a678fb54f0fa5d2f0c26c655252f9267a527)
Reviewed-on: https://gerrit.libreoffice.org/21346
Reviewed-by: Michael Stahl 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 58747a5..fc58dd4 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -345,6 +345,8 @@ doSearch(LOKDocView* pDocView, const char* pText, bool 
bBackwards, bool highligh
 boost::property_tree::ptree aTree;
 GtkWidget* drawingWidget = GTK_WIDGET(pDocView);
 GdkWindow* drawingWindow = gtk_widget_get_window(drawingWidget);
+if (!drawingWindow)
+return;
 std::shared_ptr cairoVisRegion( 
gdk_window_get_visible_region(drawingWindow),
 cairo_region_destroy);
 cairo_rectangle_int_t cairoVisRect;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Sahasranaman M S

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

New commits:
commit 08f6107edf3021c31571769e45f7c4b5267d6924
Author: Sahasranaman M S 
Date:   Wed Nov 4 16:00:49 2015 +0530

tdf#46637 - Make partially visible cells fully visible on mouse click

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

diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 068b7fe..606755a 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -376,7 +376,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 if( bUnmark )
 {
 MoveCursorAbs( nCol, nRow,
-SC_FOLLOW_NONE, false, false );
+SC_FOLLOW_LINE, false, false );
 }
 }
 
___
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' - oox/source sd/qa

2016-01-11 Thread Zolnai Tamás

 dev/null|binary
 oox/source/ppt/pptshape.cxx |9 ++---
 sd/qa/unit/import-tests.cxx |   27 ---
 3 files changed, 6 insertions(+), 30 deletions(-)

New commits:
commit e18c062be49042945644db438608a6e58c7dc98a
Author: Zolnai TamÃ¡s 
Date:   Sun Dec 20 14:21:43 2015 +0100

tdf#96051: FILESAVE: Roundtrip any PPTX file with Shapes creates invalid 
OOXML

Revert "bnc#584721: Import subtitle block to master slides"
This reverts commit b3d50feaa87b670baf68288974005ac26ad31736.

It seems the imported subtitle block makes export corrupt the
output. Better to have a valid output.

(cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9)

Conflicts:
sd/qa/unit/import-tests.cxx

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

diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index cf61562..f347639 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -144,9 +144,12 @@ void PPTShape::addShape(
 break;
 case XML_subTitle :
 {
-sServiceName = 
"com.sun.star.presentation.SubtitleShape";
-aMasterTextListStyle = 
rSlidePersist.getMasterPersist().get() ? 
rSlidePersist.getMasterPersist()->getBodyTextStyle() : 
rSlidePersist.getBodyTextStyle();
-bClearText = true;
+if ( ( meShapeLocation == Master ) || ( 
meShapeLocation == Layout ) )
+sServiceName = OUString();
+else {
+sServiceName = 
"com.sun.star.presentation.SubtitleShape";
+aMasterTextListStyle = 
rSlidePersist.getMasterPersist().get() ? 
rSlidePersist.getMasterPersist()->getBodyTextStyle() : 
rSlidePersist.getBodyTextStyle();
+}
 }
 break;
case XML_obj :
diff --git a/sd/qa/unit/data/pptx/bnc584721_3.pptx 
b/sd/qa/unit/data/pptx/bnc584721_3.pptx
deleted file mode 100644
index 3866257..000
Binary files a/sd/qa/unit/data/pptx/bnc584721_3.pptx and /dev/null differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index bdedca1..53f14e8 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -92,7 +92,6 @@ public:
 void testCreationDate();
 void testBnc584721_1();
 void testBnc584721_2();
-void testBnc584721_3();
 void testBnc584721_4();
 void testBnc904423();
 void testShapeLineStyle();
@@ -134,7 +133,6 @@ public:
 CPPUNIT_TEST(testCreationDate);
 CPPUNIT_TEST(testBnc584721_1);
 CPPUNIT_TEST(testBnc584721_2);
-CPPUNIT_TEST(testBnc584721_3);
 CPPUNIT_TEST(testBnc584721_4);
 CPPUNIT_TEST(testBnc904423);
 CPPUNIT_TEST(testShapeLineStyle);
@@ -862,31 +860,6 @@ void SdImportTest::testBnc584721_2()
 xDocShRef->DoClose();
 }
 
-void SdImportTest::testBnc584721_3()
-{
-// Subtitle was simply skipped on master slides.
-// Check whether the second shape is a subtitle shape with the right text.
-
-::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_3.pptx"), PPTX);
-
-SdDrawDocument *pDoc = xDocShRef->GetDoc();
-CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
-const SdrPage *pPage = &(pDoc->GetPage(1)->TRG_GetMasterPage());
-CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
-SdrTextObj *pTxtObj = dynamic_cast( pPage->GetObj(1) );
-CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL);
-
-// Check the shape type
-uno::Reference< drawing::XShape > xShape( pTxtObj->getUnoShape(), 
uno::UNO_QUERY );
-CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.presentation.SubtitleShape"), 
xShape->getShapeType());
-
-// Check the text
-const EditTextObject& aEdit = 
pTxtObj->GetOutlinerParaObject()->GetTextObject();
-CPPUNIT_ASSERT_EQUAL(OUString("Click to edit Master subtitle style"), 
aEdit.GetText(0));
-
-xDocShRef->DoClose();
-}
-
 void SdImportTest::testBnc591147()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc591147.pptx"), PPTX);
___
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 writerfilter/source

2016-01-11 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/tdf92045.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a31708d9df01e7eae5c9ca39f4ee82fd6644dfe6
Author: Miklos Vajna 
Date:   Wed Jan 6 08:23:20 2016 +0100

tdf#92045 DOCX import:  doesn't mean blinking

Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use
constants for ST_TextEffect values, 2014-09-22), the problem was that
while the tokenizer stopped using hardcoded token values, the matching
dmapper code wasn't adapted.

(cherry picked from commit ac6bfd85df271b650dbd24b45391dac346ecd72c)

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

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf92045.docx 
b/sw/qa/extras/ooxmlimport/data/tdf92045.docx
new file mode 100644
index 000..d41f523
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf92045.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 043f7f4..17849e3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2869,6 +2869,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx")
 CPPUNIT_ASSERT(aActualSize.Height > 0);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx")
+{
+// This was true,  resulted in setting the 
blinking font effect.
+CPPUNIT_ASSERT_EQUAL(false, getProperty(getRun(getParagraph(1), 1), 
"CharFlash"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4b11157..973151e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1625,7 +1625,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 case NS_ooxml::LN_EG_RPrBase_effect:
 // The file-format has many character animations. We have only
 // one, so we use it always. Suboptimal solution though.
-if (nIntValue)
+if (nIntValue != NS_ooxml::LN_Value_ST_TextEffect_none)
 rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true ));
 else
 rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 97046] ensure build system variables start with gb_ unless there are very, very good reasons not to

2016-01-11 Thread bugzilla-daemon

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

Björn Michaelsen  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

-- 
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: svx/source sw/qa sw/source

2016-01-11 Thread susobhang70

 svx/source/xoutdev/_xoutbmp.cxx   |   20 +++-
 sw/qa/extras/htmlexport/data/tdf66822.odt |binary
 sw/qa/extras/htmlexport/htmlexport.cxx|   10 ++
 sw/source/filter/html/htmlnumwriter.cxx   |2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit ab14a9708d2937bc767c14542610ce91b56dda1e
Author: susobhang70 
Date:   Thu Jan 7 22:08:33 2016 +0530

tdf#66822 - refactor HTML export of image bullet list

removed garbage in svg-base64, added svg close tag, fixed ul tag.
Added test case for the added code.

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

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 1c4c012..22a5b62 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -364,7 +364,25 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, 
OUString& rOUString)
 css::uno::Sequence aOStmSeq( static_cast(aOStm.GetData()),aOStm.Tell() );
 OUStringBuffer aStrBuffer;
 ::sax::Converter::encodeBase64(aStrBuffer,aOStmSeq);
-rOUString = aMimeType + ";base64," + aStrBuffer.makeStringAndClear();
+OUString aEncodedBase64Image = aStrBuffer.makeStringAndClear();
+if( aLink.GetType() == GFX_LINK_TYPE_NATIVE_SVG )
+{
+  sal_Int32 ite(8);
+  sal_Int32 nBufferLength(aOStmSeq.getLength());
+  const sal_Int8* pBuffer = aOStmSeq.getConstArray();
+  css::uno::Sequence newTempSeq = aOStmSeq;// creates 
new Sequence to remove front 8 bits of garbage and encodes in base64
+  sal_Int8 *pOutBuffer = newTempSeq.getArray();
+  while(ite < nBufferLength)
+  {
+*pOutBuffer++ = pBuffer[ite];
+ite++;
+  }
+  ::sax::Converter::encodeBase64(aStrBuffer, newTempSeq);
+  aEncodedBase64Image = aStrBuffer.makeStringAndClear();
+  sal_Int32 SVGFixLength = aEncodedBase64Image.getLength();
+  aEncodedBase64Image = aEncodedBase64Image.replaceAt(SVGFixLength - 12, 
SVGFixLength, "") + "PC9zdmc+Cg=="; // removes rear 12 bits of garbage and adds 
svg closing tag in base64
+}
+rOUString = aMimeType + ";base64," + aEncodedBase64Image;
 return true;
 }
 
diff --git a/sw/qa/extras/htmlexport/data/tdf66822.odt 
b/sw/qa/extras/htmlexport/data/tdf66822.odt
new file mode 100644
index 000..88cc750
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/tdf66822.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 74d6bd1..2d8bde8 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -254,6 +254,16 @@ DECLARE_HTMLEXPORT_TEST(testExportInternalUrl, 
"tdf90905.odt")
 assertXPath(pDoc, "/html/body/p[2]/a", "href", "#bookmark");
 }
 
+DECLARE_HTMLEXPORT_TEST(testExportImageBulletList, "tdf66822.odt")
+{
+htmlDocPtr pDoc = parseHtml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+// Encoded base64 SVG bullet should match and render on browser
+assertXPath(pDoc, "/html/body/ul", 1);
+assertXPath(pDoc, "/html/body/ul", "style", "list-style-image: 
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxMi4wLjEsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDUxNDQ4KSAgLS0+DQo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiIFsNCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCgk8IUVOVElUWSBuc194bGluayAiaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+DQpdPg0KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE0LjAwOCIgaGVpZ2h0PSIxNC4wMSINCgkgdmlld0JveD0iMCAwIDE0LjAwOCAxNC4wMSIgb3ZlcmZsb3c9InZpc2libGUiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDE0LjAwOCAxNC4wMSIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cmFkaWFsR3JhZGllbnQgaWQ9IlhNTElEXzRfIiBjeD0iNy4wMDQ0IiBjeT0iNy4wMDQ5IiByPSI3LjAwNDQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4NCgkJPHN0b3Ag
 
IG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29sb3I6IzM1REIzNSIvPg0KCQk8c3RvcCAgb2Zmc2V0PSIxIiBzdHlsZT0ic3RvcC1jb2xvcjojMDBBMDAwIi8+DQoJPC9yYWRpYWxHcmFkaWVudD4NCgk8Y2lyY2xlIGZpbGw9InVybCgjWE1MSURfNF8pIiBjeD0iNy4wMDQiIGN5PSI3LjAwNSIgcj0iNy4wMDQiLz4NCgk8ZGVmcz4NCgkJPGZpbHRlciBpZD0iQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeD0iMy40ODEiIHk9IjAuNjkzIiB3aWR0aD0iNi45ODgiIGhlaWdodD0iMy44OTMiPg0KCQkJPGZlQ29sb3JNYXRyaXggIHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIxIDAgMCAwIDAgIDAgMSAwIDAgMCAgMCAwIDEgMCAwICAwIDAgMCAxIDAiLz4NCgkJPC9maWx0ZXI+DQoJPC9kZWZzPg0KCTxtYXNrIG1hc2tVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjMuNDgxIiB5PSIwLjY5MyIgd2lkdGg9IjYuOTg4IiBoZWlnaHQ9IjMuODkzIiBpZD0iWE1MSURfNV8iPg0KCQk8ZyBmaWx0ZXI9InVybCgjQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIpIj4NCgkJCTxsaW5lYXJHcmFkaWVudCBpZD0iWE1MSURfNl8iIGdyYWRp

[Bug 66822] refactor HTML export of image bullet list

2016-01-11 Thread bugzilla-daemon

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

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

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

tdf#66822 - refactor HTML export of image bullet list

It will be available in 5.2.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

Buildbot for Android

2016-01-11 Thread Chris Sherlock

Hi all,

Is there a Buildbot for Android? Or, how do I build for Android on a Alinux
based system? Pointers to documentation gratefully received :-)

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

Re: Buildbot for Android

2016-01-11 Thread Miklos Vajna

Hi,

On Tue, Jan 12, 2016 at 03:44:43AM +1100, Chris Sherlock 
 wrote:
> Is there a Buildbot for Android?

There is a tinderbox, but jenkins doesn't build on Android.

> Or, how do I build for Android on a Alinux based system? Pointers to
> documentation gratefully received :-)

See here:
https://wiki.documentfoundation.org/Development/BuildingForAndroid

Regards,

Miklos


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

[Bug 66822] refactor HTML export of image bullet list

2016-01-11 Thread bugzilla-daemon

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|| target:5.2.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

Re: Suggestion

2016-01-11 Thread Markus Mohrhard

Hey Rick,

On Sat, Jan 9, 2016 at 1:52 AM, Rick C. Hodgin 
wrote:

> I am a developer and would be willing to make these changes for the
> project, but I've never worked on the LibreOffice code base and would need
> some help getting started with the correct source files.
>
> -
> I had an idea to allow for a new type of cell formatting under
> *"Category."*  It would be for numbers, and operate similarly to the
> standard numbers on integer values, but for fractions it would perform some
> special processing.
>
> The category is called *"Metric."*
>
> When conveying fractional values, such that 1.2345E-08 (which is
> 0.000,000,012,345), it would do so in a metric-relative way using the
> standard milli (10^-3), micro (10^-6), nano (10^-9), pico (10^-12), and so
> on...
>
> In the example, the *Metric* display would cause the value to show up as 
> "*12,345
> pu*" (pico-units) if the thousands separator was used.  There would be an
> option to override the default "u" character in use, changing it into
> something that may have significance for the cell, such as "s" or "seconds"
> for seconds, "m" or "meters" for meters, and so on.
>
> An ability to lock in a working range would also exist, such as *"show
> everything in nano-units"* so that everything is adjusted to that base.
> In such a case, the above example above would present as "*12.345 nu*"
> instead of in its default *pu*.
>


All in all this sounds a bit like the idea behind the unit verification
that has been planned and partly been implemented in a feature branch. It
might be a good idea to have a look at that before implementing it
completely in the number formatter.

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

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

2016-01-11 Thread Eike Rathke

 sc/qa/unit/ucalc.cxx |1 +
 sc/source/ui/src/scfuncs.src |   31 +++
 2 files changed, 32 insertions(+)

New commits:
commit b9f89eea4e1c58a21767a219ac673befc2fe1b9a
Author: Eike Rathke 
Date:   Mon Jan 11 18:06:20 2016 +0100

add WEEKNUM_OOO hidden function resource

Not displayed in the Function Wizard's function list, unless used then
displayed when travelling through the formula expression.

Change-Id: I7489ce1eb9197a84c64c5293321553430baadebb

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7435c54..cbd3193 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2401,6 +2401,7 @@ void Test::testFunctionLists()
 "TODAY",
 "WEEKDAY",
 "WEEKNUM",
+"WEEKNUM_OOO",
 "WEEKS",
 "WEEKSINYEAR",
 "WORKDAY.INTL",
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 632cd43..59b4cec 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1218,6 +1218,37 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
 Text [ en-US ] = "The internal number of the date." ;
 };
 };
+Resource SC_OPCODE_WEEKNUM_OOO
+{
+String 1 // Description
+{
+Text [ en-US ] = "Calculates the calendar week corresponding to 
the given date.\nThis function only provides interoperability with %PRODUCTNAME 
5.0 and earlier and OpenOffice.org." ;
+};
+ExtraData =
+{
+2;
+ID_FUNCTION_GRP_DATETIME;
+U2S( HID_FUNC_WEEKNUM_OOO );
+2;  0;  0;
+0;
+};
+String 2 // Name of Parameter 1
+{
+Text [ en-US ] = "Number" ;
+};
+String 3 // Description of Parameter 1
+{
+Text [ en-US ] = "The internal number of the date." ;
+};
+String 4 // Name of Parameter 2
+{
+Text [ en-US ] = "mode" ;
+};
+String 5 // Description of Parameter 2
+{
+Text [ en-US ] = "Indicates the first day of the week (1 = Sunday, 
other values = Monday)." ;
+};
+};
  // -=*# Resource for function EASTERSUNDAY #*=-
 Resource SC_OPCODE_EASTERSUNDAY
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Jingtao Yan

 i18npool/source/collator/collator_unicode.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1b683de366f4caf82225c632f02cf0f58ae76490
Author: Jingtao Yan 
Date:   Thu Jan 7 10:28:31 2016 -0500

tdf#95494 Calc can not sort Chinese word by stroke and radical,

_length must at the tail of filename.

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

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 3a83949..e52bf20 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -156,20 +156,20 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 aBuf.append("get_").append(rLocale.Language).append("_");
 if ( rLocale.Language == "zh" ) {
 OUString func_base = aBuf.makeStringAndClear();
-OUString funclen_base = func_base + "_length";
+OUString funclen_base = func_base;
 if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(hModule,
 OUString(func_base + "TW_" + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(hModule,
-OUString(funclen_base + "TW_" + 
rAlgorithm).pData));
+OUString(funclen_base + "TW_" + rAlgorithm 
+ "_length").pData));
 }
 if (!func)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(
 hModule, OUString(func_base + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(
-hModule, OUString(funclen_base + 
rAlgorithm).pData));
+hModule, OUString(funclen_base + rAlgorithm + 
"_length").pData));
 }
 } else {
 if ( rLocale.Language == "ja" ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Caolán McNamara

 vcl/source/font/fontattributes.cxx |   26 --
 1 file changed, 24 insertions(+), 2 deletions(-)

New commits:
commit c93a43c0c9113bc1c787fe6b3c5e58a8bfd80be0
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 11 17:08:39 2016 +

initialize new member variables

Change-Id: I3839bc134b337ccb7cfdb2ee70524e4721c8f83c

diff --git a/vcl/source/font/fontattributes.cxx 
b/vcl/source/font/fontattributes.cxx
index be3ab68..49060f0 100644
--- a/vcl/source/font/fontattributes.cxx
+++ b/vcl/source/font/fontattributes.cxx
@@ -93,7 +93,18 @@ bool 
FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes
 }
 
 FontAttributes::FontAttributes()
-: mnWidth ( 0 )
+: meWeight(WEIGHT_DONTKNOW)
+, meItalic(ITALIC_DONTKNOW)
+, meFamily(FAMILY_DONTKNOW)
+, mePitch(PITCH_DONTKNOW)
+, meWidthType(WIDTH_DONTKNOW)
+, mbSymbolFlag(false)
+, mnQuality(0)
+, mbOrientation(false)
+, mbDevice(false)
+, mbSubsettable(false)
+, mbEmbeddable(false)
+, mnWidth ( 0 )
 , mnOrientation( 0 )
 , mnAscent( 0 )
 , mnDescent( 0 )
@@ -136,7 +147,18 @@ FontAttributes::FontAttributes()
 }
 
 FontAttributes::FontAttributes( const FontSelectPattern& rFontSelData )
-: mnWidth ( rFontSelData.mnWidth )
+: meWeight(WEIGHT_DONTKNOW)
+, meItalic(ITALIC_DONTKNOW)
+, meFamily(FAMILY_DONTKNOW)
+, mePitch(PITCH_DONTKNOW)
+, meWidthType(WIDTH_DONTKNOW)
+, mbSymbolFlag(false)
+, mnQuality(0)
+, mbOrientation(false)
+, mbDevice(false)
+, mbSubsettable(false)
+, mbEmbeddable(false)
+, mnWidth ( rFontSelData.mnWidth )
 , mnOrientation( (short)(rFontSelData.mnOrientation) )
 , mnAscent( 0 )
 , mnDescent( 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - i18npool/source

2016-01-11 Thread Jingtao Yan

 i18npool/source/collator/collator_unicode.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 545400aa5fce1c8aba1c02f96b3052ad447de5cc
Author: Jingtao Yan 
Date:   Thu Jan 7 10:28:31 2016 -0500

tdf#95494 Calc can not sort Chinese word by stroke and radical,

_length must at the tail of filename.

Change-Id: I434e89bf052d8f3130bfca62d71eaf8588c2bac9
Reviewed-on: https://gerrit.libreoffice.org/21213
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 1b683de366f4caf82225c632f02cf0f58ae76490)
Reviewed-on: https://gerrit.libreoffice.org/21367

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 3a83949..e52bf20 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -156,20 +156,20 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 aBuf.append("get_").append(rLocale.Language).append("_");
 if ( rLocale.Language == "zh" ) {
 OUString func_base = aBuf.makeStringAndClear();
-OUString funclen_base = func_base + "_length";
+OUString funclen_base = func_base;
 if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(hModule,
 OUString(func_base + "TW_" + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(hModule,
-OUString(funclen_base + "TW_" + 
rAlgorithm).pData));
+OUString(funclen_base + "TW_" + rAlgorithm 
+ "_length").pData));
 }
 if (!func)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(
 hModule, OUString(func_base + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(
-hModule, OUString(funclen_base + 
rAlgorithm).pData));
+hModule, OUString(funclen_base + rAlgorithm + 
"_length").pData));
 }
 } else {
 if ( rLocale.Language == "ja" ) {
___
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' - i18npool/source

2016-01-11 Thread Jingtao Yan

 i18npool/source/collator/collator_unicode.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9059f747c50eaf99a3c065f90b598208edbcb86b
Author: Jingtao Yan 
Date:   Thu Jan 7 10:28:31 2016 -0500

tdf#95494 Calc can not sort Chinese word by stroke and radical,

_length must at the tail of filename.

Change-Id: I434e89bf052d8f3130bfca62d71eaf8588c2bac9
Reviewed-on: https://gerrit.libreoffice.org/21213
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 1b683de366f4caf82225c632f02cf0f58ae76490)
Reviewed-on: https://gerrit.libreoffice.org/21368

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 3eb93f3..9ef6548 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -156,20 +156,20 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 
aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
 if ( rLocale.Language == "zh" ) {
 OUString func_base = aBuf.makeStringAndClear();
-OUString funclen_base = func_base + "_length";
+OUString funclen_base = func_base;
 if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(hModule,
 OUString(func_base + "TW_" + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(hModule,
-OUString(funclen_base + "TW_" + 
rAlgorithm).pData));
+OUString(funclen_base + "TW_" + rAlgorithm 
+ "_length").pData));
 }
 if (!func)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(
 hModule, OUString(func_base + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(
-hModule, OUString(funclen_base + 
rAlgorithm).pData));
+hModule, OUString(funclen_base + rAlgorithm + 
"_length").pData));
 }
 } else {
 if ( rLocale.Language == "ja" ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Eike Rathke

 i18npool/source/collator/collator_unicode.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 993d84f823c3d8e640f7219d5569c72d92b85b20
Author: Eike Rathke 
Date:   Mon Jan 11 18:46:14 2016 +0100

funclen_base is now superfluous here

Change-Id: I3376daf1731be6f02d62d8d659c8c3fff7605171

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index e52bf20..f5fefa0 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -156,20 +156,19 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 aBuf.append("get_").append(rLocale.Language).append("_");
 if ( rLocale.Language == "zh" ) {
 OUString func_base = aBuf.makeStringAndClear();
-OUString funclen_base = func_base;
 if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(hModule,
 OUString(func_base + "TW_" + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(hModule,
-OUString(funclen_base + "TW_" + rAlgorithm 
+ "_length").pData));
+OUString(func_base + "TW_" + rAlgorithm + 
"_length").pData));
 }
 if (!func)
 {
 func = reinterpret_cast(osl_getFunctionSymbol(
 hModule, OUString(func_base + 
rAlgorithm).pData));
 funclen = reinterpret_cast(osl_getFunctionSymbol(
-hModule, OUString(funclen_base + rAlgorithm + 
"_length").pData));
+hModule, OUString(func_base + rAlgorithm + 
"_length").pData));
 }
 } else {
 if ( rLocale.Language == "ja" ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Suggestion

2016-01-11 Thread Lionel Elie Mamane

On Sun, Jan 10, 2016 at 01:37:17PM -0500, Rick C. Hodgin wrote:

> I've been able to setup a Linux Mint 17.1 install with build-prep, git
> clone libreoffice, compile it (whew!), run it from the command line, make
> the kdevelop projects, load module_sc into kdevelop, (...) I don't
> know if there's a tool to edit the .ui and .hrc files,

The .ui files can be edited with glade.

You do something like:

export GLADE_CATALOG_SEARCH_PATH=${path_to_your_devtree}/instdir/share/glade
glade foo/bar/baz.ui

> and I'm wondering also if the .hxx and .cxx aren't generated ??

If they are in ${path_to_your_devtree}/workdir/ then they are
generated, if they are in any other directory (such as in
${path_to_your_devtree}/sc/source/*) then they are not.

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

Crash test update

2016-01-11 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/680abab7710b7e8e6f2ba9cee37a5ccd224e2993/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Remove ActiveX from LibreOffice

2016-01-11 Thread Bryan Quigley

I propose we add it to the 5.1 release notes (and 5.2 notes too) as:
Intent to Remove ActiveX support in the 5.2 release.   If this change
negatively affects your Windows application please email the
LibreOffice development list with your use case and plan for moving
off of ActiveX.  We specifically only want feedback if use ActiveX to
embed LibreOffice components into your application.

If no response, one week after 5.1.2 (Apr 10) is released let's make
the call to remove it (and update the release notes).  If we do get
responses we can obviously decide to change the plan as needed.

Anywhere else we should post this?

Thoughts?
Bryan

[1] 
https://wiki.documentfoundation.org/ReleaseNotes/5.1#Feature_removal_.2F_deprecation
[2] https://wiki.documentfoundation.org/ReleaseNotes/5.2

On Sun, Jan 10, 2016 at 11:54 PM, Chris Sherlock
 wrote:
>
>> On 11 Jan 2016, at 10:41 AM, Bryan Quigley  wrote:
>>
>> To look at this issue from another POV.. If someone showed up today
>> with an issue with a LO ActiveX control embedded in their application
>> that didn't work - what would our response be?  It's an outdated
>> technology that we're not investing in.
>>
>
> It probably shows a lack of adoption, but it doesn’t look like anyone 
> actually has reported issues with it...
>
>>> My position on ActiveX is to leave it (lest we break applications in the
>>> wild,) and to *announce its deprecation* with two goals: first, solicit the
>>> feedback of LO ActiveX consumers and, if so inclined to continue using it,
>>> help in its support. And second, to flag a date in the future when ActiveX
>>> will be completely removed from LO codebase, pending sufficient reason and
>>> support by its consumers.
>>
>> I'm happy with this.  I'd say a quicker timeframe is fine though.
>> From the announce, if no one has found an application that uses
>> LO-embedded ActiveX remove it in a month or something.  I expect that
>> if there are some users they might not hear until the install the
>> version without it regardless of what we do.
>
> Perhaps it should be announced in the release notes, with an actual version 
> where it will be removed.
>
> Chris
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 66822] refactor HTML export of image bullet list

2016-01-11 Thread bugzilla-daemon

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

Susobhan Ghosh  changed:

   What|Removed |Added

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

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

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

2016-01-11 Thread Matúš Kukan

 vcl/source/filter/jpeg/JpegWriter.cxx |   39 +++---
 1 file changed, 18 insertions(+), 21 deletions(-)

New commits:
commit d5dcfe40ff3774d82a7b8f9f3d75b5b3cdac78ba
Author: MatÃºÅ¡ Kukan 
Date:   Mon Jan 11 21:32:55 2016 +0100

tdf#94831: Check for null mpReadAccess before first use

There was erroneously added code before check in
45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36.

Change-Id: Ie2e84cfc061097c25e5d799e9c388abd9724bd93

diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx 
b/vcl/source/filter/jpeg/JpegWriter.cxx
index cb1a67f..38c65a5 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -199,32 +199,29 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
 }
 
 mpReadAccess = aGraphicBmp.AcquireReadAccess();
+if( mpReadAccess )
+{
+if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
+{// check if source is greyscale only
+bool bIsGrey = true;
 
-if ( !mbGreys )  // bitmap was not explicitly converted into greyscale,
-{// check if source is greyscale only
-
-bool bIsGrey = true;
-
-long nWidth = mpReadAccess->Width();
-for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ )
-{
-BitmapColor aColor;
-for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+long nWidth = mpReadAccess->Width();
+for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); 
nY++ )
 {
-aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
-: mpReadAccess->GetPixel( nY, nX );
-bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+BitmapColor aColor;
+for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+{
+aColor = mpReadAccess->HasPalette() ? 
mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) )
+: mpReadAccess->GetPixel( nY, 
nX );
+bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( 
aColor.GetRed() == aColor.GetBlue() );
+}
 }
+if ( bIsGrey )
+mbGreys = true;
 }
-if ( bIsGrey )
-mbGreys = true;
-}
+if( mpExpWasGrey )
+*mpExpWasGrey = mbGreys;
 
-if( mpExpWasGrey )
-*mpExpWasGrey = mbGreys;
-
-if( mpReadAccess )
-{
 mbNative = ( mpReadAccess->GetScanlineFormat() == 
BMP_FORMAT_24BIT_TC_RGB );
 
 if( !mbNative )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread andreas kainz

 icon-themes/breeze/res/savemodified_large.png |binary
 icon-themes/breeze/res/savemodified_small.png |binary
 2 files changed

New commits:
commit 8d8ddea6934f6ee0f23109fc574c02a0c8a247fd
Author: andreas kainz 
Date:   Mon Jan 11 22:06:18 2016 +0100

Breeze icons: add savemodified icon

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

diff --git a/icon-themes/breeze/res/savemodified_large.png 
b/icon-themes/breeze/res/savemodified_large.png
new file mode 100644
index 000..9b49921
Binary files /dev/null and b/icon-themes/breeze/res/savemodified_large.png 
differ
diff --git a/icon-themes/breeze/res/savemodified_small.png 
b/icon-themes/breeze/res/savemodified_small.png
new file mode 100644
index 000..29fb2e7
Binary files /dev/null and b/icon-themes/breeze/res/savemodified_small.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - icon-themes/breeze

2016-01-11 Thread andreas kainz

 icon-themes/breeze/res/savemodified_large.png |binary
 icon-themes/breeze/res/savemodified_small.png |binary
 2 files changed

New commits:
commit 9771363e9e91393ca3bf02265bb93ce8537f
Author: andreas kainz 
Date:   Mon Jan 11 22:06:18 2016 +0100

Breeze icons: add savemodified icon

Change-Id: I5f9c64f8c4b0868d2cbf4c53007076450ed7fc86
Reviewed-on: https://gerrit.libreoffice.org/21372
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit 8d8ddea6934f6ee0f23109fc574c02a0c8a247fd)
Signed-off-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/breeze/res/savemodified_large.png 
b/icon-themes/breeze/res/savemodified_large.png
new file mode 100644
index 000..9b49921
Binary files /dev/null and b/icon-themes/breeze/res/savemodified_large.png 
differ
diff --git a/icon-themes/breeze/res/savemodified_small.png 
b/icon-themes/breeze/res/savemodified_small.png
new file mode 100644
index 000..29fb2e7
Binary files /dev/null and b/icon-themes/breeze/res/savemodified_small.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Marco Cecchetti

 sd/qa/unit/tiledrendering/tiledrendering.cxx |2 --
 sd/source/ui/view/Outliner.cxx   |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d6f1ca24932ba85607ba3e526c5721132cd39252
Author: Marco Cecchetti 
Date:   Mon Jan 11 16:43:02 2016 +0100

lool - search all - unit test failure - solved

Change-Id: I5a74dd60f61fc0fdb88f08383d579b14222aa55d
Reviewed-on: https://gerrit.libreoffice.org/21365
Tested-by: Jenkins 
Reviewed-by: Marco Cecchetti 

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b3ac27e..7c14fa9 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -442,7 +442,6 @@ void SdTiledRenderingTest::testSearchAll()
 
 void SdTiledRenderingTest::testSearchAllSelections()
 {
-#if 0
 SdXImpressDocument* pXImpressDocument = createDoc("search-all.odp");
 pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);
 
@@ -451,7 +450,6 @@ void SdTiledRenderingTest::testSearchAllSelections()
 CPPUNIT_ASSERT_EQUAL(static_cast(2), m_nPart);
 // This was 1: only the first match was highlighted.
 CPPUNIT_ASSERT_EQUAL(static_cast(2), m_aSelection.size());
-#endif
 }
 
 #endif
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 69ec222..caf2da7 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -591,6 +591,8 @@ void Outliner::Initialize (bool bDirectionIsForward)
 
 bool Outliner::SearchAndReplaceAll()
 {
+DetectChange();
+
 bool bRet = true;
 // Save the current position to be restored after having replaced all
 // matches.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Marco Cecchetti

 sd/source/ui/view/Outliner.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 714bfcebd471b2dd67bca76fccbeddec762af0ec
Author: Marco Cecchetti 
Date:   Mon Jan 11 16:43:02 2016 +0100

lool - search all - unit test failure - solved

Change-Id: I5a74dd60f61fc0fdb88f08383d579b14222aa55d
Reviewed-on: https://gerrit.libreoffice.org/21366
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f32c8ed..c16ba31 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -606,6 +606,8 @@ void Outliner::Initialize (bool bDirectionIsForward)
 
 bool Outliner::SearchAndReplaceAll()
 {
+DetectChange();
+
 bool bRet = true;
 // Save the current position to be restored after having replaced all
 // matches.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Stephan Bergmann

 connectivity/source/drivers/odbc/OResultSet.cxx |6 +++---
 connectivity/source/drivers/odbc/OStatement.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0b8b372c7fe829f9457efd8f945b8b50007f1ea6
Author: Stephan Bergmann 
Date:   Mon Jan 11 23:30:39 2016 +0100

loplugin:defaultparams

Change-Id: I60c66ae8944cb4cfe82bfb762d9739446362b61b

diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx 
b/connectivity/source/drivers/odbc/OResultSet.cxx
index 1993c73..962d6bb 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1170,7 +1170,7 @@ Sequence OResultSet::impl_getBookmark(  ) 
throw( SQLException,  Runtim
 {
 if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED )
 {
-m_nUseBookmarks = getStmtOption(SQL_ATTR_USE_BOOKMARKS, SQL_UB_OFF);
+m_nUseBookmarks = getStmtOption(SQL_ATTR_USE_BOOKMARKS);
 }
 if(m_nUseBookmarks == SQL_UB_OFF)
 throw SQLException();
@@ -1368,7 +1368,7 @@ bool  OResultSet::isBookmarkable() const
 
 if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED )
 {
-m_nUseBookmarks = getStmtOption(SQL_ATTR_USE_BOOKMARKS, SQL_UB_OFF);
+m_nUseBookmarks = getStmtOption(SQL_ATTR_USE_BOOKMARKS);
 }
 
 return (m_nUseBookmarks != SQL_UB_OFF) && (nAttr & SQL_CA1_BOOKMARK) == 
SQL_CA1_BOOKMARK;
@@ -1724,7 +1724,7 @@ bool OResultSet::move(IResultSetHelper::Movement 
_eCursorPosition, sal_Int32 _nO
 } // switch(_eCursorPosition)
 if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED )
 {
-m_nUseBookmarks = getStmtOption(SQL_ATTR_USE_BOOKMARKS, SQL_UB_OFF);
+m_nUseBookmarks = getStmtOption(SQL_ATTR_USE_BOOKMARKS);
 }
 if ( m_nUseBookmarks == SQL_UB_OFF )
 {
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx 
b/connectivity/source/drivers/odbc/OStatement.cxx
index 58a7a1df..df39e29 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -674,7 +674,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const
 sal_Int32 OStatement_Base::getResultSetType() const
 {
 OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
-SQLULEN nValue (getStmtOption(SQL_ATTR_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY));
+SQLULEN nValue (getStmtOption(SQL_ATTR_CURSOR_TYPE));
 switch(nValue)
 {
 case SQL_CURSOR_FORWARD_ONLY:
@@ -863,13 +863,13 @@ void OStatement_Base::setCursorName(const OUString &_par0)
 bool OStatement_Base::isUsingBookmarks() const
 {
 OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
-return SQL_UB_OFF != getStmtOption(SQL_ATTR_USE_BOOKMARKS, SQL_UB_OFF);
+return SQL_UB_OFF != getStmtOption(SQL_ATTR_USE_BOOKMARKS);
 }
 
 bool OStatement_Base::getEscapeProcessing() const
 {
 OSL_ENSURE( m_aStatementHandle, "StatementHandle is null!" );
-return SQL_NOSCAN_OFF == getStmtOption(SQL_ATTR_USE_BOOKMARKS, SQL_NOSCAN_OFF);
+return SQL_NOSCAN_OFF == getStmtOption(SQL_ATTR_USE_BOOKMARKS);
 }
 
 void OStatement_Base::setUsingBookmarks(bool _bUseBookmark)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Remove ActiveX from LibreOffice

2016-01-11 Thread Ashod Nakashian

On Mon, Jan 11, 2016 at 2:32 PM, Bryan Quigley  wrote:
>
>
> Anywhere else we should post this?
>
>
Ideally the note would show up unintrusively upon loading/using the ActiveX
itself. Unfortunately we can't show a message box or some such UI, in case
the ActiveX is used non-interactively (in which case it'd block forever,
becoming unusable).

So the next best thing to do is *include the note in the installation*,
which should be hard to miss if made prominent (unless automated in silent
mode).

This would get the attention of possibly the users, if not the developers
(who might not even test out new versions as they come out, and expect
things to work as before). Users can contact developers, I expect, or at
least plan accordingly. Regardless, all we want is to give advance warning
before the day someone installs a newer version and be met with the
surprise of missing ActiveX altogether.

The installation and release notes seem to be the most reasonable places,
if not upon using the ActiveX itself. Unless others have better ideas.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-01-11 Thread Stephan Bergmann

 sfx2/source/bastyp/fltfnc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1a6c708968327be134cbfd422a3467752546f64
Author: Stephan Bergmann 
Date:   Mon Jan 11 23:38:38 2016 +0100

loplugin:defaultparams

Change-Id: I919f9f5f9ccb1429624f9c8e75574fec71a2b370

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 6edc51d..863b736 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1069,7 +1069,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
 // register SfxFilter
 // first erase module name from old filter names!
 // e.g: "scalc: DIF" => "DIF"
-sal_Int32 nStartRealName = sFilterName.indexOf( ": ", 0 );
+sal_Int32 nStartRealName = sFilterName.indexOf( ": " );
 if( nStartRealName != -1 )
 {
 SAL_WARN( "sfx.bastyp", "Old format, not supported!");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread andreas kainz

 icon-themes/breeze/chart2/res/gl3dbar_roundrect.png |binary
 icon-themes/galaxy/sd/cmd/transition-comb.png   |binary
 icon-themes/galaxy/sd/cmd/transition-cut.png|binary
 icon-themes/galaxy/sd/cmd/transition-fall.png   |binary
 icon-themes/galaxy/sd/cmd/transition-icons.svg  |  934 +---
 icon-themes/galaxy/sd/cmd/transition-newsflash.png  |binary
 icon-themes/galaxy/sd/cmd/transition-push.png   |binary
 icon-themes/galaxy/sd/cmd/transition-random.png |binary
 icon-themes/galaxy/sd/cmd/transition-tile-flip.png  |binary
 icon-themes/galaxy/sd/cmd/transition-turning-helix.png  |binary
 icon-themes/galaxy/sd/cmd/transition-venetian-blinds-3d.png |binary
 11 files changed, 440 insertions(+), 494 deletions(-)

New commits:
commit 2244b1e3863a6837dbc867c51940e52b6525de43
Author: andreas kainz 
Date:   Mon Jan 11 23:58:56 2016 +0100

Breeze and galaxy transition icons update according to jays recs

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

diff --git a/icon-themes/breeze/chart2/res/gl3dbar_roundrect.png 
b/icon-themes/breeze/chart2/res/gl3dbar_roundrect.png
new file mode 100644
index 000..1b7c410
Binary files /dev/null and 
b/icon-themes/breeze/chart2/res/gl3dbar_roundrect.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-comb.png 
b/icon-themes/galaxy/sd/cmd/transition-comb.png
index 737e6d6..f8cf344 100644
Binary files a/icon-themes/galaxy/sd/cmd/transition-comb.png and 
b/icon-themes/galaxy/sd/cmd/transition-comb.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-cut.png 
b/icon-themes/galaxy/sd/cmd/transition-cut.png
index 3a1d0b1..ef1f565 100644
Binary files a/icon-themes/galaxy/sd/cmd/transition-cut.png and 
b/icon-themes/galaxy/sd/cmd/transition-cut.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-fall.png 
b/icon-themes/galaxy/sd/cmd/transition-fall.png
index 910efb3..81bce28 100644
Binary files a/icon-themes/galaxy/sd/cmd/transition-fall.png and 
b/icon-themes/galaxy/sd/cmd/transition-fall.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-icons.svg 
b/icon-themes/galaxy/sd/cmd/transition-icons.svg
index d412d54..b66c4d1 100644
--- a/icon-themes/galaxy/sd/cmd/transition-icons.svg
+++ b/icon-themes/galaxy/sd/cmd/transition-icons.svg
@@ -21,19 +21,6 @@
 
-  
-
-
 
-
-
+   height="2.323"
+   x="506.57141"
+   y="640.79797" />
 
-
-
-
-
-
-
-
-
-
+   height="1.524"
+   x="506.57141"
+   y="645.79797" />
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
-
-
-
-
-
-
 
 
-
+   sodipodi:nodetypes="cc"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   transform="matrix(0.70710678,-0.70710678,-0.70710678,-0.70710678,0,0)"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   transform="matrix(-0.70710678,0.70710678,0.70710678,0.70710678,0,0)"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
-
+
-
+   r="8"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
 
-
-
-
 
 
-
-
-
 
-
-
-
-
-
-
-
-
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   d="m 385.57143,479.798 0,24 30,0 0,-24 z m 1,1 28,0 0,22 -28,0 z"
+   id="rect4160-50-6"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cc" />
 
+   x="427.65833"
+   y="409.32773"
+   transform="matrix(0.99745857,0.07124892,0,1,0,0)" />
 
+   x="430.05707"
+   y="408.08264"
+   transform="matrix(0.99654557,0.08304779,0,1,0,0)" />
 
+   x="432.71906"
+   y="404.73965"
+   transform="matrix(0.99503693,0.09950632,0,1,0,0)" />
 
+   x="435.93796"
+   y="397.7251"
+   transform="matrix(0.99227747,0.12403798,0,1,0,0)" />
 
+   x="440.56613"
+   y="383.36722"
+   transform="matrix(0.98639

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - icon-themes/breeze icon-themes/galaxy

2016-01-11 Thread andreas kainz

 icon-themes/breeze/chart2/res/gl3dbar_roundrect.png |binary
 icon-themes/galaxy/sd/cmd/transition-comb.png   |binary
 icon-themes/galaxy/sd/cmd/transition-cut.png|binary
 icon-themes/galaxy/sd/cmd/transition-fall.png   |binary
 icon-themes/galaxy/sd/cmd/transition-icons.svg  |  934 +---
 icon-themes/galaxy/sd/cmd/transition-newsflash.png  |binary
 icon-themes/galaxy/sd/cmd/transition-push.png   |binary
 icon-themes/galaxy/sd/cmd/transition-random.png |binary
 icon-themes/galaxy/sd/cmd/transition-tile-flip.png  |binary
 icon-themes/galaxy/sd/cmd/transition-turning-helix.png  |binary
 icon-themes/galaxy/sd/cmd/transition-venetian-blinds-3d.png |binary
 11 files changed, 440 insertions(+), 494 deletions(-)

New commits:
commit 8c65cd00fee2554d6fe40e4da691b04ef79116fc
Author: andreas kainz 
Date:   Mon Jan 11 23:58:56 2016 +0100

Breeze and galaxy transition icons update according to jays recs

Change-Id: I96b0a80962e1dc6925a57e5fe07041f2dccdacc6
Reviewed-on: https://gerrit.libreoffice.org/21375
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit 2244b1e3863a6837dbc867c51940e52b6525de43)
Signed-off-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/breeze/chart2/res/gl3dbar_roundrect.png 
b/icon-themes/breeze/chart2/res/gl3dbar_roundrect.png
new file mode 100644
index 000..1b7c410
Binary files /dev/null and 
b/icon-themes/breeze/chart2/res/gl3dbar_roundrect.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-comb.png 
b/icon-themes/galaxy/sd/cmd/transition-comb.png
index 6679607..f8cf344 100644
Binary files a/icon-themes/galaxy/sd/cmd/transition-comb.png and 
b/icon-themes/galaxy/sd/cmd/transition-comb.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-cut.png 
b/icon-themes/galaxy/sd/cmd/transition-cut.png
index 17f616c..ef1f565 100644
Binary files a/icon-themes/galaxy/sd/cmd/transition-cut.png and 
b/icon-themes/galaxy/sd/cmd/transition-cut.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-fall.png 
b/icon-themes/galaxy/sd/cmd/transition-fall.png
index 2744cb4..81bce28 100644
Binary files a/icon-themes/galaxy/sd/cmd/transition-fall.png and 
b/icon-themes/galaxy/sd/cmd/transition-fall.png differ
diff --git a/icon-themes/galaxy/sd/cmd/transition-icons.svg 
b/icon-themes/galaxy/sd/cmd/transition-icons.svg
index d412d54..b66c4d1 100644
--- a/icon-themes/galaxy/sd/cmd/transition-icons.svg
+++ b/icon-themes/galaxy/sd/cmd/transition-icons.svg
@@ -21,19 +21,6 @@
 
-  
-
-
 
-
-
+   height="2.323"
+   x="506.57141"
+   y="640.79797" />
 
-
-
-
-
-
-
-
-
-
+   height="1.524"
+   x="506.57141"
+   y="645.79797" />
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
-
-
-
-
-
-
 
 
-
+   sodipodi:nodetypes="cc"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   transform="matrix(0.70710678,-0.70710678,-0.70710678,-0.70710678,0,0)"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   transform="matrix(-0.70710678,0.70710678,0.70710678,0.70710678,0,0)"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
+   sodipodi:nodetypes=""
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
-
+
-
+   r="8"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90" />
 
 
-
-
-
 
 
-
-
-
 
-
-
-
-
-
-
-
-
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   d="m 385.57143,479.798 0,24 30,0 0,-24 z m 1,1 28,0 0,22 -28,0 z"
+   id="rect4160-50-6"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cc" />
 
+   x="427.65833"
+   y="409.32773"
+   transform="matrix(0.99745857,0.07124892,0,1,0,0)" />
 
+   x="430.05707"
+   y="408.08264"
+   transform="matrix(0.99654557,0.08304779,0,1,0,0)" />
 
+   x="432.71906"
+   y="404.73965"
+   transform="matrix(0.99503693,0.09950632,0,1,0,0)" />
 
+   x="435.93796"
+   y="397.7251"
+   transform="matrix(0

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

2016-01-11 Thread Maxim Monastirsky

 vcl/inc/osx/salnsmenu.h |8 
 vcl/osx/salmenu.cxx |   42 +-
 vcl/osx/salnsmenu.mm|   15 +++
 3 files changed, 16 insertions(+), 49 deletions(-)

New commits:
commit cbd483211e1ac9d9e724b5ba3e3e38a0c5abe55c
Author: Maxim Monastirsky 
Date:   Mon Jan 11 18:17:49 2016 +0200

tdf#96875 Make OS X native context menus compatible

... with how framework::MenuBarManager works, following my
work of converting context menus to use it instead of
SfxPopupMenuManager (see tdf#93837).

MenuBarManager sets menu item properties/select handler
when the menu activates - in MenuBarManager::Activate, but
it was never called for submenus. The solution is to adapt
the menuNeedsUpdate delegate to call Menu::Activate.

This makes submenu items work, but doesn't update their
visual state (e.g. title). The reason is that
AquaSalMenu::ShowNativePopupMenu is creating a copy of the
NSMenu, so AquaSalMenu::SetItemText is modifying the wrong
NSMenu instance.

Another problem is that AquaSalMenu::ShowNativePopupMenu
tries to removes (via removeUnusedItemsRunner function)
all disabled items, but the correct state is set by
MenuBarManager only when the menu activates. So we must
handle disabled items only after MenuBarManager::Activate
did its job.

Turns out that we can just hide items in NSMenu instead
of removing them, so no need to clone the NSMenu anymore.

Change-Id: If0785b7f9d5f0ad98ced23585379039a51dc13bf
Reviewed-on: https://gerrit.libreoffice.org/21374
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/vcl/inc/osx/salnsmenu.h b/vcl/inc/osx/salnsmenu.h
index 47c410b..f815c14 100644
--- a/vcl/inc/osx/salnsmenu.h
+++ b/vcl/inc/osx/salnsmenu.h
@@ -33,10 +33,6 @@ class AquaSalMenuItem;
 
 @interface SalNSMenu : NSMenu
 {
-/* Caution: SalNSMenu instances occasionally are binary copied
-   in AquaSalMenu::ShowNativePopupMenu. If any members are added,
-   please take this into account !
-*/
 AquaSalMenu*mpMenu;
 }
 -(id)initWithMenu: (AquaSalMenu*)pMenu;
@@ -46,10 +42,6 @@ class AquaSalMenuItem;
 
 @interface SalNSMenuItem : NSMenuItem
 {
-/* Caution: SalNSMenuItem instances occasionally are binary copied
-   in AquaSalMenu::ShowNativePopupMenu. If any members are added,
-   please take this into account !
-*/
 AquaSalMenuItem*mpMenuItem;
 }
 -(id)initWithMenuItem: (AquaSalMenuItem*)pMenuItem;
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 5119d6c..91a5c2e 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -317,37 +317,6 @@ AquaSalMenu::~AquaSalMenu()
 }
 }
 
-sal_Int32 removeUnusedItemsRunner(NSMenu * pMenu)
-{
-NSArray * elements = [pMenu itemArray];
-NSEnumerator * it = [elements objectEnumerator];
-id elem;
-NSMenuItem * lastDisplayedMenuItem = nil;
-sal_Int32 drawnItems = 0;
-bool firstEnabledItemIsNoSeparator = false;
-while((elem=[it nextObject]) != nil) {
-NSMenuItem * item = static_cast(elem);
-if( (![item isEnabled] && ![item isSeparatorItem]) || ([item 
isSeparatorItem] && (lastDisplayedMenuItem != nil && [lastDisplayedMenuItem 
isSeparatorItem])) ) {
-[[item menu]removeItem:item];
-} else {
-if( ! firstEnabledItemIsNoSeparator && [item isSeparatorItem] ) {
-[[item menu]removeItem:item];
-} else {
-firstEnabledItemIsNoSeparator = true;
-lastDisplayedMenuItem = item;
-drawnItems++;
-if( [item hasSubmenu] ) {
-removeUnusedItemsRunner( [item submenu] );
-}
-}
-}
-}
-if( lastDisplayedMenuItem != nil && [lastDisplayedMenuItem 
isSeparatorItem]) {
-[[lastDisplayedMenuItem menu]removeItem:lastDisplayedMenuItem];
-}
-return drawnItems;
-}
-
 bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& 
rRect, FloatWinPopupFlags nFlags)
 {
 // do not use native popup menu when AQUA_NATIVE_MENUS is set to false
@@ -365,13 +334,6 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * 
pWin, const Rectangle& rR
 NSView* pPopupNSView = static_cast(pWin->ImplGetWindow()->ImplGetFrame())->mpNSView;
 NSRect popupFrame = [pPopupNSView frame];
 
-// since we manipulate the menu below (removing entries)
-// let's rather make a copy here and work with that
-NSMenu* pCopyMenu = [mpMenu copy];
-
-// filter disabled elements
-removeUnusedItemsRunner( pCopyMenu );
-
 // create frame rect
 NSRect displayPopupFrame = NSMakeRect( rRect.Left()+(offset-1), 
rRect.Top()+(offset+1), popupFrame.size.width, 0 );
 pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false);
@@ -390,15 +352,13 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * 
pWin, c

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

2016-01-11 Thread Chris Sherlock

 include/vcl/fontcharmap.hxx|   23 ++-
 vcl/inc/impfont.hxx|   57 -
 vcl/inc/impfontcharmap.hxx |   82 +
 vcl/quartz/salgdi.cxx  |1 
 vcl/source/gdi/impfont.cxx |2 
 vcl/unx/generic/fontmanager/fontmanager.cxx|2 
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |1 
 vcl/win/gdi/salfont.cxx|1 
 8 files changed, 107 insertions(+), 62 deletions(-)

New commits:
commit 27154c4bb5ed80d699d706ebd1a84e807c3f1625
Author: Chris Sherlock 
Date:   Mon Jan 11 18:31:28 2016 +1100

vcl: split off ImplFontCharMap into it's own header file

Change-Id: I6173cd191cd771b1f030fa737617b1067278ee10
Reviewed-on: https://gerrit.libreoffice.org/21338
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index c4d495c..b0dca54 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FONTCHARMAP_METRIC_HXX
-#define INCLUDED_FONTCHARMAP_METRIC_HXX
+#ifndef INCLUDED_FONTCHARMAP_HXX
+#define INCLUDED_FONTCHARMAP_HXX
 
 #include 
 #include 
@@ -164,6 +164,23 @@ inline void intrusive_ptr_release(FontCharMap* 
pFontCharMap)
 delete pFontCharMap;
 }
 
-#endif // INCLUDED_FONTCHARMAP_METRIC_HXX
+
+// CmapResult is a normalized version of the many CMAP formats
+class VCL_PLUGIN_PUBLIC CmapResult
+{
+public:
+explicitCmapResult( bool bSymbolic = false,
+const sal_uInt32* pRangeCodes = nullptr, int 
nRangeCount = 0,
+const int* pStartGlyphs = nullptr, const 
sal_uInt16* pGlyphIds = nullptr );
+
+const sal_uInt32*   mpRangeCodes;
+const int*  mpStartGlyphs;
+const sal_uInt16*   mpGlyphIds;
+int mnRangeCount;
+boolmbSymbolic;
+boolmbRecoded;
+};
+
+#endif // INCLUDED_FONTCHARMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 904c9eb..77b90a4 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -161,64 +161,7 @@ private:
 FcPattern* mpPattern;
 };
 
-// - ImplFontCharMap -
 
-class CmapResult;
-
-class VCL_PLUGIN_PUBLIC ImplFontCharMap
-{
-public:
-explicitImplFontCharMap( const CmapResult& );
-virtual ~ImplFontCharMap();
-
-private:
-friend class FontCharMap;
-friend void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap);
-friend void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap);
-
-ImplFontCharMap( const ImplFontCharMap& ) = delete;
-voidoperator=( const ImplFontCharMap& ) = delete;
-
-static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false);
-boolisDefaultMap() const;
-
-private:
-const sal_uInt32*   mpRangeCodes; // pairs of StartCode/(EndCode+1)
-const int*  mpStartGlyphs;// range-specific mapper to glyphs
-const sal_uInt16*   mpGlyphIds;   // individual glyphid mappings
-int mnRangeCount;
-int mnCharCount;  // covered codepoints
-mutable sal_uInt32  mnRefCount;
-};
-
-inline void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap)
-{
-++pImplFontCharMap->mnRefCount;
-}
-
-inline void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap)
-{
-if (--pImplFontCharMap->mnRefCount == 0)
-delete pImplFontCharMap;
-}
-
-// CmapResult is a normalized version of the many CMAP formats
-class VCL_PLUGIN_PUBLIC CmapResult
-{
-public:
-explicitCmapResult( bool bSymbolic = false,
-const sal_uInt32* pRangeCodes = nullptr, int 
nRangeCount = 0,
-const int* pStartGlyphs = nullptr, const 
sal_uInt16* pGlyphIds = nullptr );
-
-const sal_uInt32*   mpRangeCodes;
-const int*  mpStartGlyphs;
-const sal_uInt16*   mpGlyphIds;
-int mnRangeCount;
-boolmbSymbolic;
-boolmbRecoded;
-};
-
-bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
 
 #endif // INCLUDED_VCL_INC_IMPFONT_HXX
 
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
new file mode 100644
index 000..ef5c961
--- /dev/null
+++ b/vcl/inc/impfontcharmap.hxx
@@ -0,0 +1,82 @@
+/* -*- 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/.
+ *
+ * This

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

2016-01-11 Thread Chris Sherlock

 vcl/Library_vcl.mk |2 
 vcl/source/gdi/fontcharmap.cxx |  599 +
 vcl/source/gdi/impfont.cxx |  599 -
 3 files changed, 600 insertions(+), 600 deletions(-)

New commits:
commit 49f39e0de1a4fb4360198087bf1b2d1fc61742c6
Author: Chris Sherlock 
Date:   Mon Jan 11 18:36:36 2016 +1100

vcl: tidyup file name impfont.cxx -> fontcharmap.cxx

Change-Id: Ib2acc963704c7613e1d3bd1761b619ece1aef79f
Reviewed-on: https://gerrit.libreoffice.org/21339
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 961bb05..578786f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -281,7 +281,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/hatch \
 vcl/source/gdi/impanmvw \
 vcl/source/gdi/impbmp \
-vcl/source/gdi/impfont \
+vcl/source/gdi/fontcharmap \
 vcl/source/gdi/impgraph \
 vcl/source/gdi/impvect \
 vcl/source/gdi/jobset \
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/fontcharmap.cxx
similarity index 100%
rename from vcl/source/gdi/impfont.cxx
rename to vcl/source/gdi/fontcharmap.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-11 Thread Chris Sherlock

 vcl/Library_vcl.mk  |2 
 vcl/source/font/fontcharmap.cxx |  599 
 vcl/source/gdi/fontcharmap.cxx  |  599 
 3 files changed, 600 insertions(+), 600 deletions(-)

New commits:
commit bc35e3708e15a1cf06d2a95f3fe096ae8a894cec
Author: Chris Sherlock 
Date:   Mon Jan 11 18:55:14 2016 +1100

vcl: move fontcharmap.cxx to the font folder

Change-Id: If764e87a90d57b473019ec96a1ef9026dc9675ae
Reviewed-on: https://gerrit.libreoffice.org/21340
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 578786f..f35ce6e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -281,7 +281,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/hatch \
 vcl/source/gdi/impanmvw \
 vcl/source/gdi/impbmp \
-vcl/source/gdi/fontcharmap \
 vcl/source/gdi/impgraph \
 vcl/source/gdi/impvect \
 vcl/source/gdi/jobset \
@@ -396,6 +395,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/font/fontselect \
 vcl/source/font/fontinstance \
 vcl/source/font/fontcache \
+vcl/source/font/fontcharmap \
 vcl/source/fontsubset/cff \
 vcl/source/fontsubset/fontsubset \
 vcl/source/fontsubset/gsub \
diff --git a/vcl/source/gdi/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
similarity index 100%
rename from vcl/source/gdi/fontcharmap.cxx
rename to vcl/source/font/fontcharmap.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 117 matches

Mail list logo