[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - lotuswordpro/source
lotuswordpro/source/filter/lwppara.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7fd61a5e182597ddf41bb957dcaef11fe0eef816
Author: Caolán McNamara
Date: Tue Dec 29 10:54:53 2015 +
return early if Container invalidated
Change-Id: I3983070f1fe447e4b75b956cf95d3b3c5266b3f9
(cherry picked from commit 78c6be9cf3c9c3c87d2f41981bdc61047171eafe)
(cherry picked from commit 312ae095c17812f40d08997acc058a1314675af5)
Reviewed-on: https://gerrit.libreoffice.org/21001
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/lotuswordpro/source/filter/lwppara.cxx
b/lotuswordpro/source/filter/lwppara.cxx
index 520be75..1825dee 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -253,6 +253,8 @@ void LwpPara::Parse(IXFStream* pOutputStream)
{
m_pXFContainer = new XFContentContainer;
XFConvert(m_pXFContainer);
+if (!m_pXFContainer)
+return;
m_pXFContainer->ToXml(pOutputStream);
m_pXFContainer->Reset();
delete m_pXFContainer;
___
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' - lotuswordpro/source
lotuswordpro/source/filter/lwplayout.cxx | 11 +++
lotuswordpro/source/filter/lwplayout.hxx | 12 +++-
2 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit ab8c84b1b1d14adc0cabbc063ba8a5132a540201
Author: Caolán McNamara
Date: Mon Dec 28 14:43:50 2015 +
guard against infinite recursion in GetGeometry
(cherry picked from commit 9ec011f6874cf663db54d0420c41d9299e4ed882)
(cherry picked from commit 02c113a3ab57d7880bb1f794e192fb42aea078e1)
Change-Id: I901f77f5846512cb528f2e14bbc50409fa29bef2
Reviewed-on: https://gerrit.libreoffice.org/20988
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index a0d3a510..53e1261 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -585,9 +585,12 @@ void LwpLayoutMisc::Read(LwpObjectStream* pStrm)
}
LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
-: LwpVirtualLayout(objHdr, pStrm),
- m_pStyleStuff(new LwpLayoutStyle), m_pMiscStuff(new LwpLayoutMisc)
-{}
+: LwpVirtualLayout(objHdr, pStrm)
+, m_pStyleStuff(new LwpLayoutStyle)
+, m_pMiscStuff(new LwpLayoutMisc)
+, m_bGettingGeometry(false)
+{
+}
LwpMiddleLayout::~LwpMiddleLayout()
{
@@ -663,7 +666,7 @@ rtl::Reference LwpMiddleLayout::GetBasedOnStyle()
* @descr: Get the geometry of current layout
*
*/
-LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
+LwpLayoutGeometry* LwpMiddleLayout::Geometry()
{
if( !m_LayGeometry.IsNull() )
{
diff --git a/lotuswordpro/source/filter/lwplayout.hxx
b/lotuswordpro/source/filter/lwplayout.hxx
index 749513b..f540aec 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -321,7 +321,15 @@ public:
virtual bool MarginsSameAsParent() SAL_OVERRIDE;
virtual double MarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide)
SAL_OVERRIDE;
-LwpLayoutGeometry* GetGeometry();
+LwpLayoutGeometry* GetGeometry()
+{
+if (m_bGettingGeometry)
+throw std::runtime_error("recursion in layout");
+m_bGettingGeometry = true;
+auto pRet = Geometry();
+m_bGettingGeometry = false;
+return pRet;
+}
double GetGeometryHeight();
double GetGeometryWidth();
LwpBorderStuff* GetBorderStuff();
@@ -369,6 +377,7 @@ protected:
void Read() SAL_OVERRIDE;
private:
LwpObjectID m_BasedOnStyle;
+LwpLayoutGeometry* Geometry();
protected:
enum
{
@@ -387,6 +396,7 @@ protected:
LwpObjectID m_LayBorderStuff;
LwpObjectID m_LayBackgroundStuff;
LwpObjectID m_LayExtBorderStuff;
+boolm_bGettingGeometry;
public:
LwpObjectID& GetContent() { return m_Content; }
LwpTabOverride* GetTabOverride();
___
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' - lotuswordpro/source
lotuswordpro/source/filter/lwpfribmark.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 934e28385b5e7462a36780a04a08013d00924fb5
Author: Caolán McNamara
Date: Sun Dec 27 20:14:27 2015 +
guard against missing Foundry
Change-Id: I5ba66ff020b8226ac01af985f68c3ef67057c01a
(cherry picked from commit 7f9b57bda4d88262ecbe4518c744913b9770)
(cherry picked from commit 5ae038d2341e4a7f8dedb77be75efd557d01bcc9)
Reviewed-on: https://gerrit.libreoffice.org/20967
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx
b/lotuswordpro/source/filter/lwpfribmark.cxx
index 143a00f..2a51e0e 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -136,12 +136,12 @@ void LwpFribCHBlock::XFConvert(XFContentContainer*
pXFPara,LwpStory* pStory)
void LwpFribBookMark::RegisterStyle(LwpFoundry* pFoundry)
{
OUString name;
-LwpBookMark* pBook = pFoundry->GetBookMark(GetMarkerID());
+LwpBookMark* pBook = pFoundry ? pFoundry->GetBookMark(GetMarkerID()) :
nullptr;
if (pBook)
name = pBook->GetName();
OUString sDivision;
-LwpDocument* pDoc = pFoundry->GetDocument();
+LwpDocument* pDoc = pFoundry ? pFoundry->GetDocument() : nullptr;
if (pDoc)
{
LwpObjectID& rID = pDoc->GetDivInfoID();
___
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' - lotuswordpro/source
lotuswordpro/source/filter/lwptoc.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7f4fcdbda41753c7923974c0af58271e38cdabe3
Author: Caolán McNamara
Date: Sun Dec 27 20:18:08 2015 +
guard against missing Container Layout
Change-Id: Ie43b13448a6cacd3af4822b85f06ed84a2d38ff9
(cherry picked from commit 932c74e38ca397d82d609831e79ceaef2183cf64)
(cherry picked from commit 1b2015281ee34f187fdb747db5f6223e8de63df4)
Reviewed-on: https://gerrit.libreoffice.org/20968
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/lotuswordpro/source/filter/lwptoc.cxx
b/lotuswordpro/source/filter/lwptoc.cxx
index ce2c239..ec6cb5e 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -287,7 +287,10 @@ void
LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nSt
XFContentContainer * pTableContainer = pXFFrame;
// if *this is a TOCSuperTableLayout and it's located in a cell
// add the frame to upper level and add TOCSuperTableLayout into
the frame
-if ( GetContainerLayout()->IsCell() )
+rtl::Reference xContainer(GetContainerLayout());
+if (!xContainer.is())
+return;
+if (xContainer->IsCell())
{
pTableContainer = pCont; // TOC contain table directly
pXFFrame->Add(pCont);
@@ -296,7 +299,7 @@ void LwpTocSuperLayout::XFConvertFrame(XFContentContainer*
pCont, sal_Int32 nSt
else
{
//add frame to the container
-pCont ->Add(pXFFrame);
+pCont->Add(pXFFrame);
}
pTableLayout->XFConvert(pTableContainer);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove ActiveX from LibreOffice
;-( .. Oh, I provide the wrong information again. I mean the file didn't open if LibreOffice is installed with both Explorer Extension and Active X disabled. 2016-01-01 14:53 GMT+08:00 Mark Hung : > Hi all, > > I lost my memory and messed tdf#90386 with another thing. > It didn't seem to work properly since IE8 / LO4.2.2, though I did try to > fix it. > > > > 2016-01-01 12:17 GMT+08:00 Chris Sherlock : > >> Unless I'm much mistaken, the ActiveX control does almost exactly the >> same thing that the browser plugin did for Netscape. >> >> Given that in Edge Microsoft will not be supporting ActiveX plugins any >> more, isn't the justification for removing the ActiveX control the same as >> for remove the NSAPI plugin? >> >> Incidentally, in the bug references, if I had to hazard a guess, the ocx >> needs to be registered manually. >> >> Chris >> >> On Fri, Jan 1, 2016 at 3:13 AM, Thorsten Behrens < >> t...@documentfoundation.org> wrote: >> >>> Mark Hung wrote: >>> > A valid use case is to read the uploaded documents on SharePoint >>> server in >>> > intranet. >>> > Eventually it obsoletes, but I prefer to consider this when facing some >>> > directly related event. >>> > ( i.e EOL of Windows7, new toolchain ceasing ActiveX support, or >>> security >>> > issue which lacks of engineer resource ) . >>> > >>> Yeah. Unless this is not working anywhere anymore, let's keep it for >>> the while - seems it's useful at least in some cases. And the cost of >>> maintaining it is currently near zero, no? >>> >>> Cheers, >>> >>> -- Thorsten >>> >>> ___ >>> LibreOffice mailing list >>> LibreOffice@lists.freedesktop.org >>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >>> >>> >> > > > -- > Mark Hung > -- Mark Hung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove ActiveX from LibreOffice
Hi all, I lost my memory and messed tdf#90386 with another thing. It didn't seem to work properly since IE8 / LO4.2.2, though I did try to fix it. 2016-01-01 12:17 GMT+08:00 Chris Sherlock : > Unless I'm much mistaken, the ActiveX control does almost exactly the same > thing that the browser plugin did for Netscape. > > Given that in Edge Microsoft will not be supporting ActiveX plugins any > more, isn't the justification for removing the ActiveX control the same as > for remove the NSAPI plugin? > > Incidentally, in the bug references, if I had to hazard a guess, the ocx > needs to be registered manually. > > Chris > > On Fri, Jan 1, 2016 at 3:13 AM, Thorsten Behrens < > t...@documentfoundation.org> wrote: > >> Mark Hung wrote: >> > A valid use case is to read the uploaded documents on SharePoint server >> in >> > intranet. >> > Eventually it obsoletes, but I prefer to consider this when facing some >> > directly related event. >> > ( i.e EOL of Windows7, new toolchain ceasing ActiveX support, or >> security >> > issue which lacks of engineer resource ) . >> > >> Yeah. Unless this is not working anywhere anymore, let's keep it for >> the while - seems it's useful at least in some cases. And the cost of >> maintaining it is currently near zero, no? >> >> Cheers, >> >> -- Thorsten >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> >> > -- Mark Hung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/PhysicalFontFace.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 24aa580514818b35a6098d3b3ff5d5bc77a7fdb1 Author: Chris Sherlock Date: Fri Jan 1 17:05:24 2016 +1100 vcl: End friendship Always wanted to write a commit that said this. Change-Id: I52f6a188e2d115eef9a1e3f702ed127fea3ebb4c diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index 1593e33..4c3704c 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -86,7 +86,6 @@ protected: longmnHeight; // Height (in pixels) private: -friend class PhysicalFontFamily; const int mnMagic;// poor man's RTTI }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/PhysicalFontFace.hxx | 16 +---
vcl/source/font/PhysicalFontFace.cxx | 32 ++--
vcl/source/font/PhysicalFontFamily.cxx |3 +--
3 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 60676b3b376d5f3f6fb29fa68c34117c2149bbec
Author: Chris Sherlock
Date: Fri Jan 1 16:30:15 2016 +1100
vcl: Get rid of FontMatchStatus structure
It's used exactly once, as a parameter of
PhysicalFontFace::IsBetterMatch()'s
function signature. That parameter only acts as input, so I think this is a
case of YAGNI creeping into the code, thus I'm getting rid of it.
Change-Id: Ic5e24f484d652ba2196e512795d0d27f4239df30
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index ce40712..1593e33 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -25,19 +25,9 @@
#include "outfont.hxx"
class ImplFontEntry;
-struct FontMatchStatus;
class FontSelectPattern;
class PhysicalFontFamily;
-struct FontMatchStatus
-{
-public:
-int mnFaceMatch;
-int mnHeightMatch;
-int mnWidthMatch;
-const OUString* mpTargetStyleName;
-};
-
// - PhysicalFontFace -
// TODO: no more direct access to members
@@ -78,7 +68,11 @@ public:
boolIsScalable() const { return (mnHeight ==
0); }
boolCheckMagic( int n ) const { return (n ==
mnMagic); }
-boolIsBetterMatch( const FontSelectPattern&,
FontMatchStatus& ) const;
+boolIsBetterMatch( const FontSelectPattern& rFSD,
+ const OUString* pTargetStyleName,
+ int nStatusFaceMatch=0,
+ int nStatusHeightMatch=0,
+ int nStatusWidthMatch=0 ) const;
sal_Int32 CompareWithSize( const PhysicalFontFace& ) const;
sal_Int32 CompareIgnoreSize( const PhysicalFontFace& ) const;
virtual~PhysicalFontFace() {}
diff --git a/vcl/source/font/PhysicalFontFace.cxx
b/vcl/source/font/PhysicalFontFace.cxx
index c7c7ee2..5383e36 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -84,7 +84,11 @@ sal_Int32 PhysicalFontFace::CompareWithSize( const
PhysicalFontFace& rOther ) co
return 0;
}
-bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD,
FontMatchStatus& rStatus ) const
+bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD,
+ const OUString* pTargetStyleName,
+ int nStatusFaceMatch,
+ int nStatusHeightMatch,
+ int nStatusWidthMatch ) const
{
int nMatch = 0;
@@ -92,8 +96,8 @@ bool PhysicalFontFace::IsBetterMatch( const
FontSelectPattern& rFSD, FontMatchSt
if( rFontName.equalsIgnoreAsciiCase( GetFamilyName() ) )
nMatch += 24;
-if( rStatus.mpTargetStyleName
-&& GetStyleName().equalsIgnoreAsciiCase( *rStatus.mpTargetStyleName ) )
+if( pTargetStyleName
+&& GetStyleName().equalsIgnoreAsciiCase( *pTargetStyleName ) )
nMatch += 12;
if( (rFSD.GetPitch() != PITCH_DONTKNOW) && (rFSD.GetPitch() == GetPitch())
)
@@ -198,31 +202,31 @@ bool PhysicalFontFace::IsBetterMatch( const
FontSelectPattern& rFSD, FontMatchSt
}
}
-if( rStatus.mnFaceMatch > nMatch )
+if( nStatusFaceMatch > nMatch )
return false;
-else if( rStatus.mnFaceMatch < nMatch )
+else if( nStatusFaceMatch < nMatch )
{
-rStatus.mnFaceMatch = nMatch;
-rStatus.mnHeightMatch= nHeightMatch;
-rStatus.mnWidthMatch = nWidthMatch;
+nStatusFaceMatch = nMatch;
+nStatusHeightMatch= nHeightMatch;
+nStatusWidthMatch = nWidthMatch;
return true;
}
// when two fonts are still competing prefer the
// one with the best matching height
-if( rStatus.mnHeightMatch > nHeightMatch )
+if( nStatusHeightMatch > nHeightMatch )
return false;
-else if( rStatus.mnHeightMatch < nHeightMatch )
+else if( nStatusHeightMatch < nHeightMatch )
{
-rStatus.mnHeightMatch= nHeightMatch;
-rStatus.mnWidthMatch = nWidthMatch;
+nStatusHeightMatch= nHeightMatch;
+nStatusWidthMatch = nWidthMatch;
return true;
}
-if( rStatus.mnWidthMatch > nWidthMatch )
+if( nStatusWidthMatch > nWidthMatch )
return false;
-rStatus.mnWidthMatch = nWidthMatch;
+nStatusWidthMatch = nWidthMatch;
return true;
}
diff --git a/vcl/source/font/PhysicalFontFamily.cxx
b/vcl/source/font/PhysicalFontFamily.cxx
index 8cc691b..cc01487 100
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/fontmanager/fontsubst.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit a27fac3b8f2bae18f62bab315051732df1bb29ab
Author: Chris Sherlock
Date: Fri Jan 1 14:41:51 2016 +1100
vcl: %s/Fc\(.*\)Substititution/Fc\1Substitution/g (thanks vim regexps!)
Change-Id: Ic56ed5b33f2a00bda27779b7b7450b95a1dfb14b
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index c0b76e1..309cb18 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -37,7 +37,7 @@
// platform specific font substitution hooks
-class FcPreMatchSubstititution
+class FcPreMatchSubstitution
: public ImplPreMatchFontSubstitution
{
public:
@@ -48,7 +48,7 @@ private:
mutable CachedFontMapType maCachedFontMap;
};
-class FcGlyphFallbackSubstititution
+class FcGlyphFallbackSubstitution
:public ImplGlyphFallbackFontSubstitution
{
// TODO: add a cache
@@ -95,14 +95,14 @@ void SalGenericInstance::RegisterFontSubstitutors(
PhysicalFontCollection* pFont
// register font fallback substitutions (unless disabled by bit0)
if( (nDisableBits & 1) == 0 )
{
-static FcPreMatchSubstititution aSubstPreMatch;
+static FcPreMatchSubstitution aSubstPreMatch;
pFontCollection->SetPreMatchHook( &aSubstPreMatch );
}
// register glyph fallback substitutions (unless disabled by bit1)
if( (nDisableBits & 2) == 0 )
{
-static FcGlyphFallbackSubstititution aSubstFallback;
+static FcGlyphFallbackSubstitution aSubstFallback;
pFontCollection->SetFallbackHook( &aSubstFallback );
}
}
@@ -138,12 +138,12 @@ namespace
: mrAttributes(rAttributes)
{
}
-bool operator()(const FcPreMatchSubstititution::value_type& rOther)
const
+bool operator()(const FcPreMatchSubstitution::value_type& rOther) const
{ return rOther.first == mrAttributes; }
};
}
-bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern
&rFontSelData ) const
+bool FcPreMatchSubstitution::FindFontSubstitute( FontSelectPattern
&rFontSelData ) const
{
// We don't actually want to talk to Fontconfig at all for symbol fonts
if( rFontSelData.IsSymbolFont() )
@@ -185,7 +185,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern &rFontSelDa
RTL_TEXTENCODING_UTF8));
const OString aSubstName(OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
-printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ",
+printf( "FcPreMatchSubstitution \"%s\" bipw=%d%d%d%d -> ",
aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
if( !bHaveSubstitute )
@@ -208,7 +208,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern &rFontSelDa
return bHaveSubstitute;
}
-bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern&
rFontSelData,
+bool FcGlyphFallbackSubstitution::FindFontSubstitute( FontSelectPattern&
rFontSelData,
OUString& rMissingCodes ) const
{
// We don't actually want to talk to Fontconfig at all for symbol fonts
@@ -233,7 +233,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern& rFont
RTL_TEXTENCODING_UTF8));
const OString aSubstName(OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
-printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->",
+printf( "FcGFSubstitution \"%s\" bipw=%d%d%d%d ->",
aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
if( !bHaveSubstitute )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove ActiveX from LibreOffice
P.S. given that LO is crashing due to the ActiveX control borking, that bug still needs troubleshooting. Mark, can you provide us with a backtrace when soffice dies, then add it to the TDF bug report? Chris On Fri, Jan 1, 2016 at 3:17 PM, Chris Sherlock wrote: > Unless I'm much mistaken, the ActiveX control does almost exactly the same > thing that the browser plugin did for Netscape. > > Given that in Edge Microsoft will not be supporting ActiveX plugins any > more, isn't the justification for removing the ActiveX control the same as > for remove the NSAPI plugin? > > Incidentally, in the bug references, if I had to hazard a guess, the ocx > needs to be registered manually. > > Chris > > On Fri, Jan 1, 2016 at 3:13 AM, Thorsten Behrens < > t...@documentfoundation.org> wrote: > >> Mark Hung wrote: >> > A valid use case is to read the uploaded documents on SharePoint server >> in >> > intranet. >> > Eventually it obsoletes, but I prefer to consider this when facing some >> > directly related event. >> > ( i.e EOL of Windows7, new toolchain ceasing ActiveX support, or >> security >> > issue which lacks of engineer resource ) . >> > >> Yeah. Unless this is not working anywhere anymore, let's keep it for >> the while - seems it's useful at least in some cases. And the cost of >> maintaining it is currently near zero, no? >> >> Cheers, >> >> -- Thorsten >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> >> > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove ActiveX from LibreOffice
Unless I'm much mistaken, the ActiveX control does almost exactly the same thing that the browser plugin did for Netscape. Given that in Edge Microsoft will not be supporting ActiveX plugins any more, isn't the justification for removing the ActiveX control the same as for remove the NSAPI plugin? Incidentally, in the bug references, if I had to hazard a guess, the ocx needs to be registered manually. Chris On Fri, Jan 1, 2016 at 3:13 AM, Thorsten Behrens wrote: > Mark Hung wrote: > > A valid use case is to read the uploaded documents on SharePoint server > in > > intranet. > > Eventually it obsoletes, but I prefer to consider this when facing some > > directly related event. > > ( i.e EOL of Windows7, new toolchain ceasing ActiveX support, or > security > > issue which lacks of engineer resource ) . > > > Yeah. Unless this is not working anywhere anymore, let's keep it for > the while - seems it's useful at least in some cases. And the cost of > maintaining it is currently near zero, no? > > Cheers, > > -- Thorsten > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic vcl/inc vcl/quartz vcl/source vcl/unx vcl/win
vcl/generic/glyphs/gcach_ftyp.cxx |6 -
vcl/generic/glyphs/gcach_ftyp.hxx |8 +-
vcl/generic/glyphs/glyphcache.cxx |2
vcl/generic/print/genpspgraphics.cxx| 10 +-
vcl/inc/PhysicalFontFace.hxx|4 -
vcl/inc/generic/genpspgraphics.h|4 -
vcl/inc/generic/glyphcache.hxx |2
vcl/inc/outfont.hxx | 115
vcl/inc/quartz/salgdi.h |4 -
vcl/inc/win/salgdi.h|2
vcl/quartz/ctfonts.cxx |6 -
vcl/quartz/ctfonts.hxx |2
vcl/quartz/ctlayout.cxx |2
vcl/quartz/salgdi.cxx |2
vcl/source/font/PhysicalFontFace.cxx|4 -
vcl/source/gdi/pdfwriter_impl.cxx |4 -
vcl/source/outdev/font.cxx |2
vcl/unx/generic/gdi/cairotextrender.cxx |2
vcl/win/gdi/salgdi3.cxx | 28 +++
19 files changed, 105 insertions(+), 104 deletions(-)
New commits:
commit e9598378b55cc05c95bd3f410c396bd44a74341d
Author: Chris Sherlock
Date: Thu Dec 31 15:20:12 2015 +1100
vcl: merge ImplDevFontAttributes with ImplFontAttributes
ImplFontAttributes handles device independent data, whilst
ImplDevFontAttributes handles device dependent data. However, there
is no real reason for the divide in classes, and in fact I'm not at
all a fan of using a pImpl directly - sort of defeats the purpose of
having one!
Change-Id: I2db22727e3479b14e3bc37dfad9136703bbdeb13
Reviewed-on: https://gerrit.libreoffice.org/21018
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index e9a0c9e..f5b4a0d 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -191,7 +191,7 @@ const void * graphiteFontTable(const void* appFaceHandle,
unsigned int name, siz
}
#endif
-FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
+FtFontInfo::FtFontInfo( const ImplFontAttributes& rDevFontAttributes,
const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId)
:
maFaceFT( nullptr ),
@@ -367,7 +367,7 @@ FreetypeManager::~FreetypeManager()
}
void FreetypeManager::AddFontFile( const OString& rNormalizedName,
-int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&
rDevFontAttr)
+int nFaceNum, sal_IntPtr nFontId, const ImplFontAttributes& rDevFontAttr)
{
if( rNormalizedName.isEmpty() )
return;
@@ -419,7 +419,7 @@ ServerFont* FreetypeManager::CreateFont( const
FontSelectPattern& rFSD )
return pNew;
}
-ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const
ImplDevFontAttributes& rDFA )
+ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplFontAttributes&
rDFA )
: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
mpFtFontInfo( pFI )
{
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx
b/vcl/generic/glyphs/gcach_ftyp.hxx
index 82b52b3..1fe995a 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -58,7 +58,7 @@ private:
class FtFontInfo
{
public:
- FtFontInfo( const ImplDevFontAttributes&,
+ FtFontInfo( const ImplFontAttributes&,
const OString& rNativeFileName,
int nFaceNum, sal_IntPtr nFontId);
~FtFontInfo();
@@ -94,7 +94,7 @@ private:
GraphiteFaceWrapper * mpGraphiteFace;
#endif
sal_IntPtr mnFontId;
-ImplDevFontAttributes maDevFontAttributes;
+ImplFontAttributes maDevFontAttributes;
FontCharMapPtr mpFontCharMap;
@@ -133,7 +133,7 @@ public:
~FreetypeManager();
voidAddFontFile( const OString& rNormalizedName,
-int nFaceNum, sal_IntPtr nFontId, const
ImplDevFontAttributes&);
+int nFaceNum, sal_IntPtr nFontId, const
ImplFontAttributes&);
voidAnnounceFonts( PhysicalFontCollection* ) const;
voidClearFontList();
@@ -153,7 +153,7 @@ private:
enum { IFTSFONT_MAGIC = 0x1F150A1C };
public:
-ImplFTSFontData( FtFontInfo*, const
ImplDevFontAttributes& );
+ImplFTSFontData( FtFontInfo*, const
ImplFontAttributes& );
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const
override;
virtual PhysicalFontFace* Clone() const override { return new
ImplFTSFontData( *this ); }
diff --git a/vcl/generic/glyphs/glyphcache.cxx
b/vcl/generic/glyphs/glyphcache.cxx
index 8a2c955..1f69fd6 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -146,7 +146,7 @@ GlyphCache& GlyphCache::GetInstance()
}
void GlyphCache::AddFontFile( const OString& rNormalizedName, in
[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/Package_opengl.mk vcl/workben
vcl/Package_opengl.mk |1
vcl/inc/openglgdiimpl.hxx |3 +
vcl/opengl/gdiimpl.cxx | 60 ++---
vcl/opengl/invert50FragmentShader.glsl | 23
vcl/workben/vcldemo.cxx| 11 +-
5 files changed, 62 insertions(+), 36 deletions(-)
New commits:
commit e81c4d3ea00949cb4d8c3f44e09e70b19eebb826
Author: Michael Meeks
Date: Thu Dec 31 21:19:48 2015 +
tdf#95507 - implement opengl / 50% invert method.
Change-Id: I8488cb8e8074831a6f81e6c8c122462c9819d25d
Reviewed-on: https://gerrit.libreoffice.org/21025
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index df3520c..9d42502 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -17,6 +17,7 @@ $(eval $(call
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
blendedTextureVertexShader.glsl \
dumbVertexShader.glsl \
diffTextureFragmentShader.glsl \
+invert50FragmentShader.glsl \
convolutionFragmentShader.glsl \
linearGradientFragmentShader.glsl \
maskFragmentShader.glsl \
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index a81b1e8..63bebdc 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -111,7 +111,8 @@ public:
bool UseSolid( SalColor nColor );
bool UseSolidAA( SalColor nColor, double fTransparency );
bool UseSolidAA( SalColor nColor );
-bool UseInvert();
+bool UseInvert50();
+bool UseInvert(SalInvert nFlags);
void DrawPoint( long nX, long nY );
void DrawLine( double nX1, double nY1, double nX2, double nY2 );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 549f8ae..21ff211 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -551,6 +551,13 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor,
double fTransparency )
return true;
}
+bool OpenGLSalGraphicsImpl::UseInvert50()
+{
+if( !UseProgram( "dumbVertexShader", "invert50FragmentShader" ) )
+return false;
+return true;
+}
+
bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
{
return UseSolid( nColor, 0.0f );
@@ -575,13 +582,24 @@ bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
return UseSolidAA( nColor, 0.0 );
}
-bool OpenGLSalGraphicsImpl::UseInvert()
+bool OpenGLSalGraphicsImpl::UseInvert( SalInvert nFlags )
{
OpenGLZone aZone;
-if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
-return false;
-mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR, GL_ZERO );
+if( ( nFlags & SAL_INVERT_50 ) ||
+( nFlags & SAL_INVERT_TRACKFRAME ) )
+{
+if( !UseInvert50() )
+return false;
+mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR,
+ GL_ONE_MINUS_SRC_COLOR );
+}
+else
+{
+if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
+return false;
+mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR, GL_ZERO );
+}
return true;
}
@@ -1742,25 +1760,10 @@ void OpenGLSalGraphicsImpl::invert(
long nWidth, long nHeight,
SalInvert nFlags)
{
-// TODO Figure out what are those:
-// * SAL_INVERT_50 (50/50 pattern?)
-// * SAL_INVERT_TRACKFRAME (dash-line rectangle?)
-
PreDraw();
-if( nFlags & SAL_INVERT_TRACKFRAME )
-{
-
-}
-else if( nFlags & SAL_INVERT_50 )
-{
-
-}
-else // just invert
-{
-if( UseInvert() )
-DrawRect( nX, nY, nWidth, nHeight );
-}
+if( UseInvert( nFlags ) )
+DrawRect( nX, nY, nWidth, nHeight );
PostDraw();
}
@@ -1769,19 +1772,8 @@ void OpenGLSalGraphicsImpl::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
{
PreDraw();
-if( nFlags & SAL_INVERT_TRACKFRAME )
-{
-
-}
-else if( nFlags & SAL_INVERT_50 )
-{
-
-}
-else // just invert
-{
-if( UseInvert() )
-DrawPolygon( nPoints, pPtAry );
-}
+if( UseInvert( nFlags ) )
+DrawPolygon( nPoints, pPtAry );
PostDraw();
}
diff --git a/vcl/opengl/invert50FragmentShader.glsl
b/vcl/opengl/invert50FragmentShader.glsl
new file mode 100644
index 000..76f3e1f
--- /dev/null
+++ b/vcl/opengl/invert50FragmentShader.glsl
@@ -0,0 +1,23 @@
+/* -*- 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/.
+ */
+
+/*precision mediump float;*/
+
+void main() {
+vec2 tex_mod = mod(gl_FragCoord, 2);
+bool bLeft = tex_mod.x > 0 && tex_mod.x < 1;
+bool bTop = tex_mod.y > 0 && tex_mod.y < 1;
+// horrors - where is th
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/inc vcl/opengl vcl/Package_opengl.mk vcl/workben
vcl/Package_opengl.mk |1
vcl/inc/openglgdiimpl.hxx |3 +
vcl/opengl/gdiimpl.cxx | 60 ++---
vcl/opengl/invert50FragmentShader.glsl | 23
vcl/workben/vcldemo.cxx| 11 +-
5 files changed, 62 insertions(+), 36 deletions(-)
New commits:
commit b3da866919c9a6904f8b007bbe018846dcf7f35c
Author: Michael Meeks
Date: Thu Dec 31 21:19:48 2015 +
tdf#95507 - implement opengl / 50% invert method.
Change-Id: I8488cb8e8074831a6f81e6c8c122462c9819d25d
Reviewed-on: https://gerrit.libreoffice.org/21026
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index df3520c..9d42502 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -17,6 +17,7 @@ $(eval $(call
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
blendedTextureVertexShader.glsl \
dumbVertexShader.glsl \
diffTextureFragmentShader.glsl \
+invert50FragmentShader.glsl \
convolutionFragmentShader.glsl \
linearGradientFragmentShader.glsl \
maskFragmentShader.glsl \
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index c4fa5c2..647c83f 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -111,7 +111,8 @@ public:
bool UseSolid( SalColor nColor );
bool UseSolidAA( SalColor nColor, double fTransparency );
bool UseSolidAA( SalColor nColor );
-bool UseInvert();
+bool UseInvert50();
+bool UseInvert(SalInvert nFlags);
void DrawPoint( long nX, long nY );
void DrawLine( double nX1, double nY1, double nX2, double nY2 );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index a5cec8a..e92b6b6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -551,6 +551,13 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor,
double fTransparency )
return true;
}
+bool OpenGLSalGraphicsImpl::UseInvert50()
+{
+if( !UseProgram( "dumbVertexShader", "invert50FragmentShader" ) )
+return false;
+return true;
+}
+
bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
{
return UseSolid( nColor, 0.0f );
@@ -575,13 +582,24 @@ bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
return UseSolidAA( nColor, 0.0 );
}
-bool OpenGLSalGraphicsImpl::UseInvert()
+bool OpenGLSalGraphicsImpl::UseInvert( SalInvert nFlags )
{
OpenGLZone aZone;
-if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
-return false;
-mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR, GL_ZERO );
+if( ( nFlags & SAL_INVERT_50 ) ||
+( nFlags & SAL_INVERT_TRACKFRAME ) )
+{
+if( !UseInvert50() )
+return false;
+mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR,
+ GL_ONE_MINUS_SRC_COLOR );
+}
+else
+{
+if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
+return false;
+mpProgram->SetBlendMode( GL_ONE_MINUS_DST_COLOR, GL_ZERO );
+}
return true;
}
@@ -1737,25 +1755,10 @@ void OpenGLSalGraphicsImpl::invert(
long nWidth, long nHeight,
SalInvert nFlags)
{
-// TODO Figure out what are those:
-// * SAL_INVERT_50 (50/50 pattern?)
-// * SAL_INVERT_TRACKFRAME (dash-line rectangle?)
-
PreDraw();
-if( nFlags & SAL_INVERT_TRACKFRAME )
-{
-
-}
-else if( nFlags & SAL_INVERT_50 )
-{
-
-}
-else // just invert
-{
-if( UseInvert() )
-DrawRect( nX, nY, nWidth, nHeight );
-}
+if( UseInvert( nFlags ) )
+DrawRect( nX, nY, nWidth, nHeight );
PostDraw();
}
@@ -1764,19 +1767,8 @@ void OpenGLSalGraphicsImpl::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
{
PreDraw();
-if( nFlags & SAL_INVERT_TRACKFRAME )
-{
-
-}
-else if( nFlags & SAL_INVERT_50 )
-{
-
-}
-else // just invert
-{
-if( UseInvert() )
-DrawPolygon( nPoints, pPtAry );
-}
+if( UseInvert( nFlags ) )
+DrawPolygon( nPoints, pPtAry );
PostDraw();
}
diff --git a/vcl/opengl/invert50FragmentShader.glsl
b/vcl/opengl/invert50FragmentShader.glsl
new file mode 100644
index 000..76f3e1f
--- /dev/null
+++ b/vcl/opengl/invert50FragmentShader.glsl
@@ -0,0 +1,23 @@
+/* -*- 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/.
+ */
+
+/*precision mediump float;*/
+
+void main() {
+vec2 tex_mod = mod(gl_FragCoord, 2);
+bool bLeft = tex_mod.x > 0 && tex_mod.x < 1;
+bool bTop = tex_mod.y > 0 && tex_mod.y < 1;
+// horrors - where is the XOR
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1c/c4adfc0c3212fcb815fdd5d33002f6e5d79d2a
1c/c4adfc0c3212fcb815fdd5d33002f6e5d79d2a |1 + 1 file changed, 1 insertion(+) New commits: commit 59f9fa5a5e113b1a26c6ccb8bf118b88a072caf5 Author: Caolán McNamara Date: Thu Dec 31 20:05:50 2015 + Notes added by 'git notes add' diff --git a/1c/c4adfc0c3212fcb815fdd5d33002f6e5d79d2a b/1c/c4adfc0c3212fcb815fdd5d33002f6e5d79d2a new file mode 100644 index 000..6007077 --- /dev/null +++ b/1c/c4adfc0c3212fcb815fdd5d33002f6e5d79d2a @@ -0,0 +1 @@ +prefer: 764a1cdf2ad41a280186ff84e88e12f5860202bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 17/d97611ae7115f4e21f81904aae40f27155489c
17/d97611ae7115f4e21f81904aae40f27155489c |1 + 1 file changed, 1 insertion(+) New commits: commit e7cbd95157528762af411f9c3d3c3a33f2416585 Author: Caolán McNamara Date: Thu Dec 31 20:05:03 2015 + Notes added by 'git notes add' diff --git a/17/d97611ae7115f4e21f81904aae40f27155489c b/17/d97611ae7115f4e21f81904aae40f27155489c new file mode 100644 index 000..13d6179 --- /dev/null +++ b/17/d97611ae7115f4e21f81904aae40f27155489c @@ -0,0 +1 @@ +prefer: 04a98015101b8fea3b200e0bf3a2469d8c75fdf7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 43/1d695380f6a33a6bc0190d653c59be08a2360e d9/3d490d1c04be116548aed140df9eda9987d592
43/1d695380f6a33a6bc0190d653c59be08a2360e |1 + d9/3d490d1c04be116548aed140df9eda9987d592 |1 + 2 files changed, 2 insertions(+) New commits: commit 8c34993aec99c281169d48581c23f3c659b8476c Author: Caolán McNamara Date: Thu Dec 31 20:04:52 2015 + Notes added by 'git notes add' diff --git a/43/1d695380f6a33a6bc0190d653c59be08a2360e b/43/1d695380f6a33a6bc0190d653c59be08a2360e new file mode 100644 index 000..13d6179 --- /dev/null +++ b/43/1d695380f6a33a6bc0190d653c59be08a2360e @@ -0,0 +1 @@ +prefer: 04a98015101b8fea3b200e0bf3a2469d8c75fdf7 commit 93c28463d78c4e3ff68e2eb7634150e336eb2bc0 Author: Caolán McNamara Date: Thu Dec 31 20:04:40 2015 + Notes added by 'git notes add' diff --git a/d9/3d490d1c04be116548aed140df9eda9987d592 b/d9/3d490d1c04be116548aed140df9eda9987d592 new file mode 100644 index 000..13d6179 --- /dev/null +++ b/d9/3d490d1c04be116548aed140df9eda9987d592 @@ -0,0 +1 @@ +prefer: 04a98015101b8fea3b200e0bf3a2469d8c75fdf7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 74/36d7726b0142a253c63de64e532ae426f8d30b
74/36d7726b0142a253c63de64e532ae426f8d30b |1 + 1 file changed, 1 insertion(+) New commits: commit 790eca310126eba906548f08c0061aaeff9674ae Author: Caolán McNamara Date: Thu Dec 31 20:04:05 2015 + Notes added by 'git notes add' diff --git a/74/36d7726b0142a253c63de64e532ae426f8d30b b/74/36d7726b0142a253c63de64e532ae426f8d30b new file mode 100644 index 000..8c4de45 --- /dev/null +++ b/74/36d7726b0142a253c63de64e532ae426f8d30b @@ -0,0 +1 @@ +prefer: bde5e683286096b9255254b28a862e519d57f547 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/document.hxx|5 +++--
starmath/source/document.cxx | 17 +++--
2 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit eb65936f1996cc37632f7241cf07fc85ff633049
Author: Takeshi Abe
Date: Tue Dec 22 12:00:49 2015 +0900
starmath: Manage SmDocShell's pCursor via std::unique_ptr
Change-Id: Id9c67638e5c2e535cc06e9566c9a169471f55da8
Reviewed-on: https://gerrit.libreoffice.org/20856
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 67ef680e..2cda375 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -32,6 +32,7 @@
#include
#include
+#include
#include
#include "format.hxx"
@@ -102,7 +103,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell,
public SfxListener
VclPtr pTmpPrinter;//ditto
sal_uInt16 nModifyCount;
boolbIsFormulaArranged;
-SmCursor *pCursor;
+std::unique_ptr pCursor;
std::set< OUString >aUsedSymbols; // to export used symbols only
when saving
@@ -219,7 +220,7 @@ public:
/** True, if cursor have previously been requested and thus
* has some sort of position.
*/
-boolHasCursor() { return pCursor != nullptr; }
+boolHasCursor();
};
#endif
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index dae2175..9657bf6 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -489,17 +489,19 @@ Size SmDocShell::GetSize()
}
void SmDocShell::InvalidateCursor(){
-delete pCursor;
-pCursor = nullptr;
+pCursor.reset();
}
SmCursor& SmDocShell::GetCursor(){
if(!pCursor)
-pCursor = new SmCursor(pTree, this);
+pCursor.reset(new SmCursor(pTree, this));
return *pCursor;
}
-
+bool SmDocShell::HasCursor()
+{
+return pCursor.get() != nullptr;
+}
SmPrinterAccess::SmPrinterAccess( SmDocShell &rDocShell )
{
@@ -656,8 +658,6 @@ SmDocShell::SmDocShell( SfxModelFlags i_nSfxCreationFlags )
, nModifyCount(0)
, bIsFormulaArranged(false)
{
-pCursor = nullptr;
-
SetPool(&SfxGetpApp()->GetPool());
SmModule *pp = SM_MOD();
@@ -676,10 +676,7 @@ SmDocShell::~SmDocShell()
EndListening(aFormat);
EndListening(*pp->GetConfig());
-
-delete pCursor;
-pCursor = nullptr;
-
+pCursor.reset();
delete pEditEngine;
SfxItemPool::Free(pEditEngineItemPool);
delete pTree;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove ActiveX from LibreOffice
Mark Hung wrote: > A valid use case is to read the uploaded documents on SharePoint server in > intranet. > Eventually it obsoletes, but I prefer to consider this when facing some > directly related event. > ( i.e EOL of Windows7, new toolchain ceasing ActiveX support, or security > issue which lacks of engineer resource ) . > Yeah. Unless this is not working anywhere anymore, let's keep it for the while - seems it's useful at least in some cases. And the cost of maintaining it is currently near zero, no? Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Hot tip for vim users: highlight spaces at end of lines
On Thu, Dec 31, 2015 at 9:20 AM, Chris Sherlock wrote: > Oh! Nice :-) I'll be doing that - I'm a serial offender, but I only ever > annoy myself! Then make sure never to edit solenv/gbuild/gbuild.mk In there, there is a purposeful trailing white space. (line 55) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: distro-configs/LibreOfficeCoverity.conf postprocess/Rdb_services.mk scp2/InstallModule_ooo.mk
distro-configs/LibreOfficeCoverity.conf |1 - postprocess/Rdb_services.mk |6 -- scp2/InstallModule_ooo.mk |1 - 3 files changed, 8 deletions(-) New commits: commit 054b25c9ce96eb50d80177cb48cd9b10513806c3 Author: Bryan Quigley Date: Wed Dec 30 21:01:45 2015 -0500 Remove missed NPAPI items These were missed during the removal of NPAPI. Change-Id: Ie6233a755cd8f2995692fb8790bd65055d100251 Reviewed-on: https://gerrit.libreoffice.org/21015 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf index 63f55c4..bcbdab2 100644 --- a/distro-configs/LibreOfficeCoverity.conf +++ b/distro-configs/LibreOfficeCoverity.conf @@ -8,7 +8,6 @@ --enable-option-checking=fatal --with-system-libs --with-system-headers ---without-system-npapi-headers --without-system-libcmis --without-system-cppunit --without-system-libmwaw diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 1974b59..51c9eba 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -321,12 +321,6 @@ $(eval $(call gb_Rdb_add_components,services,\ endif # DESKTOP -ifeq ($(ENABLE_NPAPI_FROM_BROWSER),TRUE) -$(eval $(call gb_Rdb_add_components,services,\ - extensions/source/plugin/pl \ -)) -endif - ifeq ($(ENABLE_PDFIMPORT),TRUE) $(eval $(call gb_Rdb_add_components,services,\ sdext/source/pdfimport/pdfimport \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 91b11a3..c9e4199 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -20,7 +20,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ ENABLE_MACOSX_SANDBOX \ - ENABLE_NPAPI_FROM_BROWSER \ ENABLE_ONLINE_UPDATE \ ENABLE_TDE \ SYSTEM_CURL \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Johannes Hauf license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Best regards ... Johannes ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Hot tip for vim users: highlight spaces at end of lines
Oh! Nice :-) I'll be doing that - I'm a serial offender, but I only ever annoy myself! Chris On Friday, January 1, 2016, Ashod Nakashian wrote: > On Wed, Dec 30, 2015 at 8:38 PM, Chris Sherlock < > chris.sherloc...@gmail.com > > wrote: > >> Hi all, >> >> Quick tip I’d like to share - every now and then I accidentally add a >> space on the end of lines of code. >> >> You can highlight this occurring in vim by adding the following to your >> .vimrc file: >> >> highlight ExtraWhitespace ctermbg=red guibg=red >> match ExtraWhitespace /\s\+$/ >> >> Probably most vi/vim users know this, but to remove newlines, you can use >> the following: >> >> :%s/ \+$//g >> >> > You could also run that :substitute on :w and never have to worry about > trailing whitespace ever again :) > > autocmd BufWritePre * :%s/\s\+$//e > > > Change the asterisk to any pattern matching filenames to apply this to > certain filetypes only. (Also note the use of \s to match any whitespace > character.) > > More here: http://vim.wikia.com/wiki/Remove_unwanted_spaces > > Happy Vimming! > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 08bf33177ccbf0968910a7a247ce017c75decc06
Author: Jan Holesovsky
Date: Thu Dec 31 10:12:22 2015 +0100
findbar: This must be a copy'n'paste error.
Change-Id: Iecff49f04e4b68f071d63217943891a31a610aeb
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 0ae19d6..cec62ab 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -804,7 +804,7 @@ void SAL_CALL
SearchFormattedToolboxController::statusChanged( const css::frame:
FindAllToolboxController::FindAllToolboxController( const css::uno::Reference<
css::uno::XComponentContext > & rxContext )
: svt::ToolboxController( rxContext,
css::uno::Reference< css::frame::XFrame >(),
-OUString( COMMAND_EXITSEARCH ) )
+".uno:FindAll" )
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/mailmerge-toolbar' - officecfg/registry sw/inc sw/Library_sw.mk sw/sdi sw/source sw/uiconfig sw/util
Rebased ref, commits from common ancestor: commit 4a3a4ff218bfbd59f7636f4c6ec6d93e7da7feaf Author: Jan Holesovsky Date: Wed Dec 30 00:00:37 2015 +0100 mailmerge: Implement toolbar controller to exclude entries. This can be used as a "How to implement a custom widget / control in the toolbar" example: * the Controller.xcu change introduces a .uno:MailMergeExcludeEntry command so that it can be added in the toolbar .xml description (in this case mailmerge.xml) * the swriter.sdi introduces the .uno:MailMergeExcludeEntry command for the sfx2 handling - so that it can get notifications about enable/disable changes, invalidates, etc. * wrtapp.sdi + associated apphdl.cxx change make it possible to forward command invalidates (the rBindings.Invalidate(FN_MAILMERGE_EXCLUDE_ENTRY);) to the MMExcludeEntryController::statusChanged() for further handling (in this case setting the checked state according to the current data) * MMExcludeEntryController::createItemWindow() implements the custom widget itself (in this case a checkbox, but can be any VCL widget, even a custom one) * the rest (sw.component and the associated getImplementationName(), supportsService(), etc.) takes care of the instantiation of the controller. Change-Id: I68269538f779a6680b0ba98395b7985d3f1ab95a diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 31c9e4c..42559cf 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -855,6 +855,17 @@ starshapes;.uno:StarShapes.star5 + + + .uno:MailMergeExcludeEntry + + + + + + lo.writer.MMExcludeEntryController + + .uno:FindText diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index f9725be..f8c16b7 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -768,6 +768,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/uibase/dbui/maildispatcher \ sw/source/uibase/dbui/mailmergechildwindow \ sw/source/uibase/dbui/mailmergehelper \ +sw/source/uibase/dbui/mailmergetoolbarcontrols \ sw/source/uibase/dbui/mmconfigitem \ sw/source/uibase/uno/unomailmerge \ )) diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index bd622fe..d4368df 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -256,6 +256,7 @@ #define FN_MAILMERGE_PREV_ENTRY (FN_INSERT + 71)/* mail merge toolbar - go to the previous entry */ #define FN_MAILMERGE_NEXT_ENTRY (FN_INSERT + 72)/* mail merge toolbar - go to the next entry */ #define FN_MAILMERGE_LAST_ENTRY (FN_INSERT + 73)/* mail merge toolbar - go to the next entry */ +#define FN_MAILMERGE_EXCLUDE_ENTRY (FN_INSERT + 74) /* mail merge toolbar - checkbox to exclude the current entry */ #define FN_DRAWTEXT_ATTR_DLG(FN_INSERT + 76)/* position DrawText */ diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc index 8aeb2c7..9bb6168 100644 --- a/sw/inc/dbui.hrc +++ b/sw/inc/dbui.hrc @@ -81,7 +81,7 @@ #define ST_LAYOUT (RC_DBUI_BEGIN + 56) #define ST_PREPAREMERGE (RC_DBUI_BEGIN + 57) #define ST_MERGE(RC_DBUI_BEGIN + 58) -#define ST_OUTPUT (RC_DBUI_BEGIN + 59) +#define ST_EXCLUDE (RC_DBUI_BEGIN + 59) #define ST_FINISH (RC_DBUI_BEGIN + 60) #define ST_ADDRESSLIST (RC_DBUI_BEGIN + 61) diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 2b067fc..fe92ba9 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -5323,6 +5323,30 @@ SfxVoidItem MailMergeLastEntry FN_MAILMERGE_LAST_ENTRY GroupId = GID_DOCUMENT; ] +SfxVoidItem MailMergeExcludeEntry FN_MAILMERGE_EXCLUDE_ENTRY +() +[ +/* flags: */ +AutoUpdate = TRUE, +Cachable = Cachable, +FastCall = TRUE, +HasCoreId = FALSE, +HasDialog = FALSE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = TRUE, +RecordAbsolute = FALSE, +RecordPerSet; +Synchron; + +/* config: */ +AccelConfig = TRUE, +MenuConfig = TRUE, +StatusBarConfig = FALSE, +ToolBoxConfig = TRUE, +GroupId = GID_DOCUMENT; +] + SfxVoidItem MailMergeCreateDocuments FN_MAILMERGE_CREATE_DOCUMENTS () [ diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi index 2a9883f..794f796 100644 --- a/sw/sdi/wrtapp.sdi +++ b/sw/sdi/wrtapp.sdi @@ -89,6 +89,11 @@ interface StarWriter StateMethod = StateOther ; ] +FN_MAILMERGE_EXCLUDE_ENTRY +[ +StateMethod = StateOther ; +] + FN_MAILMERGE_CREATE_DOCUMENTS [ ExecMethod = ExecOther ; diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src index 7231ce2..176af67 100644 --- a/sw/s
Re: Hot tip for vim users: highlight spaces at end of lines
On Wed, Dec 30, 2015 at 8:38 PM, Chris Sherlock wrote: > Hi all, > > Quick tip I’d like to share - every now and then I accidentally add a > space on the end of lines of code. > > You can highlight this occurring in vim by adding the following to your > .vimrc file: > > highlight ExtraWhitespace ctermbg=red guibg=red > match ExtraWhitespace /\s\+$/ > > Probably most vi/vim users know this, but to remove newlines, you can use > the following: > > :%s/ \+$//g > > You could also run that :substitute on :w and never have to worry about trailing whitespace ever again :) autocmd BufWritePre * :%s/\s\+$//e Change the asterisk to any pattern matching filenames to apply this to certain filetypes only. (Also note the use of \s to match any whitespace character.) More here: http://vim.wikia.com/wiki/Remove_unwanted_spaces Happy Vimming! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 42b36a01de6b3f43ccd56e7c2062dfad2002fba1
Author: Jan Holesovsky
Date: Thu Dec 31 10:12:22 2015 +0100
findbar: This must be a copy'n'paste error.
Change-Id: Iecff49f04e4b68f071d63217943891a31a610aeb
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 4912f32..5eb1e6d 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -802,7 +802,7 @@ void SAL_CALL
SearchFormattedToolboxController::statusChanged( const css::frame:
FindAllToolboxController::FindAllToolboxController( const css::uno::Reference<
css::uno::XComponentContext > & rxContext )
: svt::ToolboxController( rxContext,
css::uno::Reference< css::frame::XFrame >(),
-OUString( COMMAND_EXITSEARCH ) )
+".uno:FindAll" )
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/mailmerge-toolbar' - 2 commits - svx/source sw/inc sw/sdi sw/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 -
sw/inc/cmdid.h |1
sw/sdi/swriter.sdi | 24 +
sw/sdi/wrtapp.sdi |5
sw/source/uibase/app/apphdl.cxx|8 ++-
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 12 +-
6 files changed, 44 insertions(+), 8 deletions(-)
New commits:
commit d7e1db5f006b565d55b6aa0520650226078135ca
Author: Jan Holesovsky
Date: Thu Dec 31 13:49:56 2015 +0100
mailmerge: Invalidate the state of the Exclude entry correctly.
Change-Id: I57cef4501eabb4883be6e655757cc497c235e93f
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index bd622fe..d4368df 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -256,6 +256,7 @@
#define FN_MAILMERGE_PREV_ENTRY (FN_INSERT + 71)/* mail merge toolbar - go
to the previous entry */
#define FN_MAILMERGE_NEXT_ENTRY (FN_INSERT + 72)/* mail merge toolbar - go
to the next entry */
#define FN_MAILMERGE_LAST_ENTRY (FN_INSERT + 73)/* mail merge toolbar - go
to the next entry */
+#define FN_MAILMERGE_EXCLUDE_ENTRY (FN_INSERT + 74) /* mail merge toolbar -
checkbox to exclude the current entry */
#define FN_DRAWTEXT_ATTR_DLG(FN_INSERT + 76)/* position DrawText */
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 2b067fc..fe92ba9 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -5323,6 +5323,30 @@ SfxVoidItem MailMergeLastEntry FN_MAILMERGE_LAST_ENTRY
GroupId = GID_DOCUMENT;
]
+SfxVoidItem MailMergeExcludeEntry FN_MAILMERGE_EXCLUDE_ENTRY
+()
+[
+/* flags: */
+AutoUpdate = TRUE,
+Cachable = Cachable,
+FastCall = TRUE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = TRUE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_DOCUMENT;
+]
+
SfxVoidItem MailMergeCreateDocuments FN_MAILMERGE_CREATE_DOCUMENTS
()
[
diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi
index 2a9883f..794f796 100644
--- a/sw/sdi/wrtapp.sdi
+++ b/sw/sdi/wrtapp.sdi
@@ -89,6 +89,11 @@ interface StarWriter
StateMethod = StateOther ;
]
+FN_MAILMERGE_EXCLUDE_ENTRY
+[
+StateMethod = StateOther ;
+]
+
FN_MAILMERGE_CREATE_DOCUMENTS
[
ExecMethod = ExecOther ;
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index a6d9ff4..0503966 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -225,6 +225,12 @@ void SwModule::StateOther(SfxItemSet &rSet)
}
}
break;
+case FN_MAILMERGE_EXCLUDE_ENTRY:
+{
+// just trigger calling of
MMExcludeEntryController::statusChanged()
+rSet.InvalidateItem(nWhich);
+}
+break;
case FN_MAILMERGE_CREATE_DOCUMENTS:
case FN_MAILMERGE_SAVE_DOCUMENTS:
case FN_MAILMERGE_PRINT_DOCUMENTS:
@@ -784,7 +790,7 @@ void SwModule::ExecOther(SfxRequest& rReq)
rBindings.Invalidate(FN_MAILMERGE_PREV_ENTRY);
rBindings.Invalidate(FN_MAILMERGE_NEXT_ENTRY);
rBindings.Invalidate(FN_MAILMERGE_LAST_ENTRY);
-// TODO an equivalent of
rBindings.Invalidate(".uno:MailMergeExcludeEntry");
+rBindings.Invalidate(FN_MAILMERGE_EXCLUDE_ENTRY);
rBindings.Update();
}
break;
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 6858e96..5af7037 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -142,7 +142,7 @@ IMPL_LINK_TYPED(MMExcludeEntryController, ExcludeHdl,
CheckBox&, rCheckbox, void
pConfigItem->ExcludeRecord(pConfigItem->GetResultSetPosition(),
rCheckbox.IsChecked());
};
-void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent&)
throw (uno::RuntimeException, std::exception)
+void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent&
rEvent) throw (uno::RuntimeException, std::exception)
{
if (!m_pExcludeCheckbox)
return;
@@ -150,15 +150,15 @@ void MMExcludeEntryController::statusChanged(const
frame::FeatureStateEvent&) th
SwView* pView = ::GetActiveView();
SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
-if (pConfigItem)
+if (!pConfigItem || !rEvent.IsEnabled)
{
-m_pExcludeCheckbox->Enable();
-
m_pExcludeCheckbox->Check(pConfigItem->IsRecordExcluded(pConfigItem->GetResultSetPosition()));
+m_pExcludeCheckbox->Disable();
+m_pExcludeCheckbox->Check(false);
}
el
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/outfont.hxx|7 ++-
vcl/source/outdev/font.cxx |4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit ecd5252f43fa6e244253eee365a70133de183101
Author: Chris Sherlock
Date: Thu Dec 31 14:48:32 2015 +1100
vcl: remove ImplFontAttributes equality operators
I am removing the equality operators for ImplFontAttributes and replacing
with a function you must call explicitly. This is in preparation for
merging ImplFontAttributes with ImplDevFontAttributes.
Change-Id: I2231ab242bfe080a0c4b8d72ae1903408c62376c
Reviewed-on: https://gerrit.libreoffice.org/21017
Tested-by: Jenkins
Reviewed-by: Chris Sherlock
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 88d5d94..7c43986 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -60,11 +60,8 @@ public:
voidSetWeight(const FontWeight eWeight ) { meWeight =
eWeight; }
voidSetWidthType(const FontWidth eWidthType) { meWidthType =
eWidthType; }
voidSetSymbolFlag(const bool bSymbolFlag ) { mbSymbolFlag
= bSymbolFlag; }
-bool operator==(const ImplFontAttributes& rOther) const;
-bool operator!=(const ImplFontAttributes& rOther) const
-{
-return !(*this == rOther);
-}
+
+boolCompareDeviceIndependentFontAttributes(const
ImplFontAttributes& rOther) const;
private:
OUStringmaName; // Font Family Name
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 4a3bffe..13cee10 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1142,7 +1142,7 @@ size_t FontSelectPatternAttributes::hashCode() const
bool FontSelectPatternAttributes::operator==(const
FontSelectPatternAttributes& rOther) const
{
-if (static_cast(*this) != static_cast(rOther))
+if (!CompareDeviceIndependentFontAttributes(rOther))
return false;
if (maTargetName != rOther.maTargetName)
@@ -1707,7 +1707,7 @@ void OutputDevice::SetFontOrientation( ImplFontEntry*
const pFontEntry ) const
}
}
-bool ImplFontAttributes::operator==(const ImplFontAttributes& rOther) const
+bool ImplFontAttributes::CompareDeviceIndependentFontAttributes(const
ImplFontAttributes& rOther) const
{
if (maName != rOther.maName)
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic vcl/inc vcl/quartz vcl/source vcl/unx vcl/win
vcl/generic/glyphs/gcach_ftyp.cxx |8 ++--
vcl/generic/print/genpspgraphics.cxx| 34
vcl/inc/outfont.hxx | 48 -
vcl/quartz/ctfonts.cxx | 10 +++---
vcl/quartz/salgdi.cxx |4 +-
vcl/source/font/PhysicalFontFace.cxx|2 -
vcl/source/font/PhysicalFontFamily.cxx | 14
vcl/source/gdi/pdfwriter_impl.cxx | 18 +--
vcl/source/outdev/font.cxx |4 +-
vcl/unx/generic/gdi/cairotextrender.cxx |2 -
vcl/win/gdi/salgdi3.cxx | 52
11 files changed, 110 insertions(+), 86 deletions(-)
New commits:
commit a74a04f98180edc577d31598bc88990d41ef02c7
Author: Chris Sherlock
Date: Thu Dec 31 14:30:49 2015 +1100
vcl: create accessor functions for ImplDevFontAttributes
Change-Id: I0494a1db1a1e5c164bd5da2d0a221a8db6c494d6
Reviewed-on: https://gerrit.libreoffice.org/21016
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 36b967f..e9a0c9e 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -209,9 +209,9 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes&
rDevFontAttributes,
mpGlyph2Char( nullptr )
{
// prefer font with low ID
-maDevFontAttributes.mnQuality += 1 - nFontId;
+maDevFontAttributes.IncreaseQualityBy( 1 - nFontId );
// prefer font with matching file names
-maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost();
+maDevFontAttributes.IncreaseQualityBy( mpFontFile->GetLangBoost() );
}
FtFontInfo::~FtFontInfo()
@@ -423,8 +423,8 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const
ImplDevFontAttributes&
: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
mpFtFontInfo( pFI )
{
-mbDevice= false;
-mbOrientation = true;
+SetBuiltInFontFlag( false );
+SetOrientationFlag( true );
}
ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD )
const
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index 149f687..ea55bf9 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -878,7 +878,7 @@ bool GenPspGraphics::AddTempDevFontHelper(
PhysicalFontCollection* pFontCollecti
// inform glyph cache of new font
ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes(
aInfo );
-aDFA.mnQuality += 5800;
+aDFA.IncreaseQualityBy( 5800 );
int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
@@ -921,7 +921,7 @@ void GenPspGraphics::GetFontMetric( ImplFontMetricData
*pMetric, int )
{
ImplDevFontAttributes aDFA = Info2DevFontAttributes( aInfo );
static_cast(*pMetric) = aDFA;
-pMetric->mbDevice = aDFA.mbDevice;
+pMetric->mbDevice = aDFA.IsBuiltInFont();
pMetric->mbScalableFont = true;
pMetric->mbTrueTypeFont = false; // FIXME, needed?
@@ -1093,40 +1093,34 @@ ImplDevFontAttributes
GenPspGraphics::Info2DevFontAttributes( const psp::FastPri
aDFA.SetWidthType( rInfo.m_eWidth );
aDFA.SetPitch( rInfo.m_ePitch );
aDFA.SetSymbolFlag( (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL) );
-aDFA.mbSubsettable = rInfo.m_bSubsettable;
-aDFA.mbEmbeddable = rInfo.m_bEmbeddable;
+aDFA.SetSubsettableFlag( rInfo.m_bSubsettable );
+aDFA.SetEmbeddableFlag( rInfo.m_bEmbeddable );
switch( rInfo.m_eType )
{
case psp::fonttype::TrueType:
-aDFA.mnQuality = 512;
-aDFA.mbDevice= false;
+aDFA.SetQuality( 512 );
+aDFA.SetBuiltInFontFlag( false );
break;
case psp::fonttype::Type1:
-aDFA.mnQuality = 0;
-aDFA.mbDevice= false;
+aDFA.SetQuality( 0 );
+aDFA.SetBuiltInFontFlag( false );
break;
default:
-aDFA.mnQuality = 0;
-aDFA.mbDevice= false;
+aDFA.SetQuality( 0 );
+aDFA.SetBuiltInFontFlag( false );
break;
}
-aDFA.mbOrientation = true;
+aDFA.SetOrientationFlag( true );
// add font family name aliases
::std::list< OUString >::const_iterator it = rInfo.m_aAliases.begin();
-bool bHasMapNames = false;
for(; it != rInfo.m_aAliases.end(); ++it )
-{
-if( bHasMapNames )
-aDFA.maMapNames += ";";
-aDFA.maMapNames += *it;
-bHasMapNames = true;
-}
+aDFA.AddMapName( *it );
#if OSL_DEBUG_LEVEL > 2
-if( bHasMapNames )
+if( aDFA.HasMapNames() )
{
OString aOrigName(OUStringToOString(aDFA.GetFamilyName(),
osl_getThreadTextEncoding()));
OString aAliasNames(OUStringToOString(aDFA.
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSet.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 23ae179392ace4d5b23b152675c60722beddfdab
Author: Julien Nabet
Date: Thu Dec 31 11:48:22 2015 +0100
Typo: NOTIFY_LISTERNERS_CHECK->NOTIFY_LISTENERS_CHECK
Change-Id: Ie4c7a7dee81c2a0890ddc8bd083c2e3fee584f7e
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 0772ef2..14fad7d 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -102,7 +102,7 @@
com_sun_star_comp_dba_ORowSet_get_implementation(css::uno::XComponentContext* co
return cppu::acquire(new ORowSet(context));
}
-#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method)
\
+#define NOTIFY_LISTENERS_CHECK(_rListeners,T,method)
\
Sequence< Reference< XInterface > > aListenerSeq =
_rListeners.getElements(); \
\
const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray();
\
@@ -1119,13 +1119,13 @@ void
ORowSet::notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,
bool ORowSet::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard&
_rGuard)
{
EventObject aEvt(*m_pMySelf);
-
NOTIFY_LISTERNERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveCursorMove);
+
NOTIFY_LISTENERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveCursorMove);
return bCheck;
}
void ORowSet::notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard&
_rGuard,const RowChangeEvent &aEvt)
{
-
NOTIFY_LISTERNERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveRowChange);
+
NOTIFY_LISTENERS_CHECK(m_aApproveListeners,XRowSetApproveListener,approveRowChange);
if ( !bCheck )
m_aErrors.raiseTypedException(
sdb::ErrorCondition::ROW_SET_OPERATION_VETOED, *this, ::cppu::UnoType<
RowSetVetoException >::get() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove ActiveX from LibreOffice
> In a word: mantainence. > > ActiveX is a failed idea by Microsoft, and in fact there is always a > burden in maintaining things that aren't seen as at all useful or even > desirable. > > We removed plugins for a similar reason. > I'm all for removing it. The less weird features, the better. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
