[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/unoctitm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2db74425208033f848ddb5bac7277d30d72afcad
Author: aybuke
Date: Sat Jan 30 14:13:10 2016 +0200
tdf#95505 Dump usage stats to text file.
Creating file's content reformatted for csv.
Change-Id: Ifefdddcae1265ad1e68e192981d6435712a9f607
Reviewed-on: https://gerrit.libreoffice.org/21920
Tested-by: Jenkins
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
Reviewed-by: jan iversen
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 78bd160..9fa0887 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -667,7 +667,7 @@ void UsageInfo::save()
if( file.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write |
osl_File_OpenFlag_Create) == osl::File::E_None )
{
-OString aUsageInfoMsg = "Document Type,Command,Count";
+OString aUsageInfoMsg = "Document Type;Command;Count";
for (UsageMap::const_iterator it = maUsage.begin(); it !=
maUsage.end(); ++it)
aUsageInfoMsg += "\n" + it->first.toUtf8() + ";" +
OString::number(it->second);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 96414] Remove feature to show Navigator during slideshow
https://bugs.documentfoundation.org/show_bug.cgi?id=96414 --- Comment #10 from Samuel Mehrbrodt --- (In reply to Bryan Quigley from comment #6) > One thing I did notice (but it's in stable too). Is that the Navigator Pen > doesn't work. Should that just be removed too? Hm it seems that button is useless, I think you can remove it (but in a separete patch, so that it's revertable in case somebody misses it). -- 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: sw/source
sw/source/uibase/sidebar/WrapPropertyPanel.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 43799f9e21277e655c7ec940d266f775cada837a Author: Rishabh Date: Wed Feb 3 04:28:48 2016 +0530 tdf#97407: Remove duplicate custom entry Remove custom entry before updating the spacing listbox Change-Id: I9476e639f4d54e87a2c9049159e6abefb02a9b5e Reviewed-on: https://gerrit.libreoffice.org/21942 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 8ee32d1..4185326 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -214,7 +214,8 @@ void WrapPropertyPanel::UpdateSpacingLB() } } -mpSpacingLB->InsertEntry(aCustomEntry); +if(mpSpacingLB->GetEntryPos(aCustomEntry) == LISTBOX_ENTRY_NOTFOUND) +mpSpacingLB->InsertEntry(aCustomEntry); mpSpacingLB->SelectEntry(aCustomEntry); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx | 26 --
1 file changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 4426c20cf308f3bf7a2d3b33f9996687113c22e3
Author: Oliver Specht
Date: Tue Feb 2 12:59:17 2016 +0100
tdf#97501: crash in SwDBManager fixed
copy the connections to a temp container and iterate that because
disposing connections changes the data source params container
Change-Id: I06c59a19a6bcf97a541b32481d1d2a63f5c34032
Reviewed-on: https://gerrit.libreoffice.org/22027
Tested-by: Jenkins
Reviewed-by: Oliver Specht
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 864e45b..0aea9c9 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -771,20 +771,26 @@ SwDBManager::SwDBManager(SwDoc* pDoc)
SwDBManager::~SwDBManager()
{
+// copy required, m_DataSourceParams can be modifed while disposing
components
+std::vector> aCopiedConnections;
for (auto & pParam : m_DataSourceParams)
{
if(pParam->xConnection.is())
{
-try
-{
-uno::Reference xComp(pParam->xConnection,
uno::UNO_QUERY);
-if(xComp.is())
-xComp->dispose();
-}
-catch(const uno::RuntimeException&)
-{
-//may be disposed already since multiple entries may have used
the same connection
-}
+aCopiedConnections.push_back(pParam->xConnection);
+}
+}
+for (auto & xConnection : aCopiedConnections)
+{
+try
+{
+uno::Reference xComp(xConnection,
uno::UNO_QUERY);
+if(xComp.is())
+xComp->dispose();
+}
+catch(const uno::RuntimeException&)
+{
+//may be disposed already since multiple entries may have used the
same connection
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source sc/source
dbaccess/source/filter/xml/xmlfilter.cxx |4 +---
sc/source/filter/xml/xmldpimp.cxx|2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 3d3204be2c1c8c3aded94cdf3d2ead7958c8b2f1
Author: Markus Mohrhard
Date: Wed Feb 3 05:25:10 2016 +0100
fix previous commit
Change-Id: I3e3b0cf703162b5f01148aced9a1d5faabb5d50d
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 5453f39..6401113 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -700,9 +700,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap()
const
SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const
OUString& rLocalName,
const uno::Reference< XAttributeList>&
xAttrList, bool bIsAutoStyle )
{
-SvXMLImportContext *pContext;
-
-pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList,
bIsAutoStyle);
+SvXMLImportContext *pContext = new OTableStylesContext(*this, _nPrefix,
rLocalName, xAttrList, bIsAutoStyle);
if (bIsAutoStyle)
SetAutoStyles(static_cast(pContext));
else
diff --git a/sc/source/filter/xml/xmldpimp.cxx
b/sc/source/filter/xml/xmldpimp.cxx
index 891db22..56d7340 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -732,7 +732,7 @@ SvXMLImportContext
*ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nP
const OUString& rLName,
const
css::uno::Reference& /* xAttrList */ )
{
-return pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+return new SvXMLImportContext( GetImport(), nPrefix, rLName );
}
void ScXMLDPSourceQueryContext::EndElement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: DPI and screen resolution on OS X
On Wed, 2016-02-03 at 10:52 +1100, Chris Sherlock wrote: > The other question is: why would we not want to the actual DPI and > screen resolution? My understanding is that, historically, the OS provided a function to query DPI but what gets returned from such function was not always accurate (or always not accurate depending on who you ask). So, the workaround at the time was to assume that DPI is always 96 (and hard-code that value) regardless of what the OS told you, which worked just fine because the monitors used back in the day had the same screen resolution. I'm not sure if that's a non-issue today. I don't know enough about this topic to tell you that with confidence. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
mdds code examples
Hi there, FYI, I've added some code examples for mdds::multi_type_vector http://kohei.us/files/mdds/doc/multi_type_vector.html#example which hopefully some people find useful. I'm planning to add more code examples for multi_type_vector as well as other data structures in mdds, but I'd like to see if there are any specific use cases for which people want to see some code examples. I'd like to hear from you if that's the case. Thanks! Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source sc/source xmloff/source
dbaccess/source/filter/xml/xmlfilter.cxx | 17
sc/source/filter/xml/XMLTableShapesContext.cxx | 19 -
sc/source/filter/xml/xmlcoli.cxx |7 ---
sc/source/filter/xml/xmlconti.cxx |7 ---
sc/source/filter/xml/xmldpimp.cxx | 49 +++--
sc/source/filter/xml/xmldrani.cxx | 21 +-
xmloff/source/draw/ximpnote.cxx| 13 +-
7 files changed, 30 insertions(+), 103 deletions(-)
New commits:
commit bd76d319bbda17f242e64b042027077e84c0f1d9
Author: Jochen Nitschke
Date: Tue Feb 2 19:19:19 2016 +0100
remove bogus nullprt checks for pContext
reported by Cppcheck
Change-Id: I737c2bd7be197ef9d0b29b922acd8021fefb7af6
Signed-off-by: Jochen Nitschke
Reviewed-on: https://gerrit.libreoffice.org/22059
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 702ac84..5453f39 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -700,15 +700,14 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap()
const
SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const
OUString& rLocalName,
const uno::Reference< XAttributeList>&
xAttrList, bool bIsAutoStyle )
{
-SvXMLImportContext *pContext = nullptr;
-if (!pContext)
-{
-pContext = new OTableStylesContext(*this, _nPrefix, rLocalName,
xAttrList, bIsAutoStyle);
-if (bIsAutoStyle)
-SetAutoStyles(static_cast(pContext));
-else
-SetStyles(static_cast(pContext));
-}
+SvXMLImportContext *pContext;
+
+pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList,
bIsAutoStyle);
+if (bIsAutoStyle)
+SetAutoStyles(static_cast(pContext));
+else
+SetStyles(static_cast(pContext));
+
return pContext;
}
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx
b/sc/source/filter/xml/XMLTableShapesContext.cxx
index 05530fcf..53389bb 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -42,19 +42,16 @@ SvXMLImportContext
*ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPre
const OUString& rLName,
const
css::uno::Reference& xAttrList )
{
-SvXMLImportContext *pContext(nullptr);
+SvXMLImportContext *pContext = nullptr;
-if (!pContext)
+ScXMLImport& rXMLImport(GetScImport());
+uno::Reference xShapes
(rXMLImport.GetTables().GetCurrentXShapes());
+if (xShapes.is())
{
-ScXMLImport& rXMLImport(GetScImport());
-uno::Reference xShapes
(rXMLImport.GetTables().GetCurrentXShapes());
-if (xShapes.is())
-{
-XMLTableShapeImportHelper*
pTableShapeImport(static_cast(rXMLImport.GetShapeImport().get()));
-pTableShapeImport->SetOnTable(true);
-pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext(
-rXMLImport, nPrefix, rLName, xAttrList, xShapes);
-}
+XMLTableShapeImportHelper*
pTableShapeImport(static_cast(rXMLImport.GetShapeImport().get()));
+pTableShapeImport->SetOnTable(true);
+pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext(
+rXMLImport, nPrefix, rLName, xAttrList, xShapes);
}
if( !pContext )
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 2f88e64..bd1de55 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -94,12 +94,7 @@ SvXMLImportContext
*ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix
const OUString& rLName,
const
css::uno::Reference& /* xAttrList */ )
{
-SvXMLImportContext *pContext = nullptr;
-
-if( !pContext )
-pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
-
-return pContext;
+return new SvXMLImportContext( GetImport(), nPrefix, rLName );
}
void ScXMLTableColContext::EndElement()
diff --git a/sc/source/filter/xml/xmlconti.cxx
b/sc/source/filter/xml/xmlconti.cxx
index de74e81..800cfd4 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -48,8 +48,6 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLName,
const
css::uno::Reference& xAttrList )
{
-SvXMLImportContext *pContext = nullptr;
-
if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_S))
{
sal_Int32 nRepeat(0);
@@ -71,10 +69,7 @@ SvXMLImportContext *Sc
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 51e9a26e702cdbdeb864844b5092d7f24ba28141
Author: Damjan Jovanovic
Date: Wed Feb 3 01:38:46 2016 +
AOO crashes when PR_GetErrorText() in xmlsecurity is called with a null
pointer, as that function actually expects a PR_GetErrorTextLength() + 1
sized buffer. Use it correctly.
Patch by: me
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index f973e79..93d6286 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -265,11 +265,13 @@ bool nsscrypto_initialize( const css::uno::Reference<
css::lang::XMultiServiceFa
if( NSS_InitReadWrite( sCertDir.getStr() ) != SECSuccess )
{
xmlsec_trace("Initializing NSS with profile failed.");
-char * error = NULL;
-
+PRInt32 errorLength = PR_GetErrorTextLength();
+char *error = new char[errorLength + 1];
+error[0] = '\0'; // as per
https://bugzilla.mozilla.org/show_bug.cgi?id=538940
PR_GetErrorText(error);
-if (error)
+if (error[0])
xmlsec_trace("%s",error);
+delete[] error;
return false ;
}
}
@@ -279,10 +281,13 @@ bool nsscrypto_initialize( const css::uno::Reference<
css::lang::XMultiServiceFa
if ( NSS_NoDB_Init(NULL) != SECSuccess )
{
xmlsec_trace("Initializing NSS without profile failed.");
-char * error = NULL;
+PRInt32 errorLength = PR_GetErrorTextLength();
+char *error = new char[errorLength + 1];
+error[0] = '\0';
PR_GetErrorText(error);
-if (error)
+if (error[0])
xmlsec_trace("%s",error);
+delete[] error;
return false ;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 95857] Sort out German plurals ...
https://bugs.documentfoundation.org/show_bug.cgi?id=95857 --- Comment #2 from dan...@fearnley.net --- I plan to have a go at this. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 95857] Sort out German plurals ...
https://bugs.documentfoundation.org/show_bug.cgi?id=95857 dan...@fearnley.net changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |dan...@fearnley.net |desktop.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
Draw Templates: arrowhd.soe and standard.soe
Is there a way to include custom arrowhd.soe and standard.soe files with a Draw Template? I was surprised when custom line endings were not retained in an ERD template. Is there a way to include custom arrows in a template? thanks. -- View this message in context: http://nabble.documentfoundation.org/Draw-Templates-arrowhd-soe-and-standard-soe-tp4173939.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 94269] Replace "n" prefix for bool variables with "b"
https://bugs.documentfoundation.org/show_bug.cgi?id=94269 --- Comment #8 from Chris Sherlock --- Try: git grep -E 'bool\s*n[A-Z]' -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 94269] Replace "n" prefix for bool variables with "b"
https://bugs.documentfoundation.org/show_bug.cgi?id=94269 --- Comment #7 from dan...@fearnley.net --- This issue seems to have been resolved and git grep -E 'bool n[A-Z]' returns no results. IS it ok to be marked as resolved? -- 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] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 647d7c778390625798dd83f470ac307d6e59803d
Author: Henry Castro
Date: Tue Feb 2 20:07:15 2016 -0400
loolwsd: first, establish pipe connection
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index f57c7ad..763e21d 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -530,13 +530,7 @@ void lokit_main(const std::string &loSubPath, const
std::string& jailId, const s
#else
("/" + loSubPath + "/program");
#endif
-
-LibreOfficeKit* loKit(lok_init_2(instdir_path.c_str(), "file:///user"));
-if (loKit == nullptr)
-{
-Log::error("Error: LibreOfficeKit initialization failed. Exiting.");
-exit(Application::EXIT_SOFTWARE);
-}
+LibreOfficeKit* loKit = nullptr;
try
{
@@ -555,6 +549,13 @@ void lokit_main(const std::string &loSubPath, const
std::string& jailId, const s
exit(Application::EXIT_SOFTWARE);
}
+loKit = lok_init_2(instdir_path.c_str(), "file:///user");
+if (loKit == nullptr)
+{
+Log::error("Error: LibreOfficeKit initialization failed.
Exiting.");
+exit(Application::EXIT_SOFTWARE);
+}
+
Log::info("loolkit [" + std::to_string(Process::id()) + "] is ready.");
std::string aResponse;
@@ -677,7 +678,8 @@ void lokit_main(const std::string &loSubPath, const
std::string& jailId, const s
// Destroy LibreOfficeKit
Log::debug("Destroying LibreOfficeKit.");
-loKit->pClass->destroy(loKit);
+if (loKit)
+loKit->pClass->destroy(loKit);
Log::info("Process [" + process_name + "] finished.");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39468] translate German comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=39468 --- Comment #232 from Commit Notification --- Chris Sherlock committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c77bb8fde80d7f35676cb1e41e5b122ac96b6a4 tdf#39468 toolkit: translate some German comments in the VCL UNO helper file 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
[Libreoffice-commits] core.git: 2 commits - toolkit/source
toolkit/source/helper/vclunohelper.cxx |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 32096592fcf067d50e22090135b542325f5e3e62
Author: Chris Sherlock
Date: Wed Feb 3 10:57:51 2016 +1100
toolkit: remove some comment cruft from vclunohelper.cxx
Change-Id: I1670e8d1adccd2123d41e51b7d7ee5228c555280
diff --git a/toolkit/source/helper/vclunohelper.cxx
b/toolkit/source/helper/vclunohelper.cxx
index 20bcae5..9c0f76f 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -57,9 +57,6 @@
using namespace ::com::sun::star;
-// class VCLUnoHelper
-
-
uno::Reference< css::awt::XToolkit> VCLUnoHelper::CreateToolkit()
{
uno::Reference< uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
@@ -514,8 +511,6 @@ sal_Int32 VCLUnoHelper::VCL2UnoEmbedMapUnit( MapUnit
nVCLMapUnit )
using namespace ::com::sun::star::util;
-//= file-local helpers
-
namespace
{
enum UnitConversionDirection
commit 9c77bb8fde80d7f35676cb1e41e5b122ac96b6a4
Author: Chris Sherlock
Date: Wed Feb 3 10:56:40 2016 +1100
tdf#39468 toolkit: translate some German comments in the VCL UNO helper file
Change-Id: Ib432f2cbfc71ebfec0ef1ecae99ae3fde1a4d946
diff --git a/toolkit/source/helper/vclunohelper.cxx
b/toolkit/source/helper/vclunohelper.cxx
index ddab490..20bcae5 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -381,7 +381,7 @@ css::awt::FontDescriptor
VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rF
aFD.Orientation = rFont.GetOrientation();
aFD.Kerning = rFont.IsKerning();
aFD.WordLineMode = rFont.IsWordLineMode();
-aFD.Type = 0; // ??? => Nur an Metric...
+aFD.Type = 0; // ??? => Only in Metric...
return aFD;
}
@@ -411,7 +411,7 @@ vcl::Font VCLUnoHelper::CreateFont( const
css::awt::FontDescriptor& rDescr, cons
if ( (FontStrikeout)rDescr.Strikeout != STRIKEOUT_DONTKNOW )
aFont.SetStrikeout( (FontStrikeout)rDescr.Strikeout );
-// Kein DONTKNOW
+// Not DONTKNOW
aFont.SetOrientation( (short)rDescr.Orientation );
aFont.SetKerning( static_cast(rDescr.Kerning) );
aFont.SetWordLineMode( rDescr.WordLineMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
DPI and screen resolution on OS X
Hi all, I’ve mentioned this briefly to Tor on IRC, but thought I’d email the mailing list and a general enquiry. I noticed that we don’t actually get the “true” DPI for OS X, nor the actual resolution - at least on high resolution screens (Retina in particular). That’s because Apple have a concept of logical points, where each point scales depending on the resolution of the screen. To get the actual resolution, you need to get the NSScreen’s backing coordinate system into an NSRect, then get the actual resolution - at which point you can calculate the PPI (I’ll use PPI from now on, it’s more accurate than DPI). I figured out how to get this out of OS X and I submitted to patches to Gerrit for review: 1. https://gerrit.libreoffice.org/#/c/21948/ - vcl: (quartz) get the actual DPI on OS X 2. https://gerrit.libreoffice.org/#/c/21973/ - vcl: (quartz) get the actual pixel height and width of OS X It’s actually pretty simple - you just use: NSRect aFrame = [pScreen convertRectToBacking:[pScreen frame]]; This gives the actual resolution in pixels, not logical points (backing coordinates are always in pixels). However, whilst everything renders correctly - the size of things obviously double (or change to whatever scale the screen resolution makes it). I guess I was wondering what the impact is, or what challenges have we had with not getting the *actual* DPI and screen resolution on OS X builds? Has anyone noticed anything odd when they are using a Mac, or developing for it? The other question is: why would we not want to the actual DPI and screen resolution? Thanks, Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 96132] Enabling Experimental Features in the UI doesn't inform the user that LibO needs to be restarted
https://bugs.documentfoundation.org/show_bug.cgi?id=96132 --- Comment #5 from Markus Mohrhard (retired) --- That is actually not completely true. There are many experimental features that work without a restart. The better question is which ones don't and then check if they can't be made to work without it. Especially as we now have a configuration change listener. -- 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
vcl/source/filter/wmf/wmfwr.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 145a569fb15b77f3e85ce5029551bb1d8adc Author: Chris Sherlock Date: Wed Feb 3 10:14:26 2016 +1100 vcl: cosmetic change - it appears some newlines were missing in wmfwr.cxx Change-Id: I1c1678c96d5b2f4a88299b9b3da317fa28ba96c4 diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 4ab9868..72830fb 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -802,7 +802,12 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, } } -pWMF->WriteUInt32( nROP ). WriteInt16( 0 ). WriteInt16( rBitmap.GetSizePixel().Height() ). WriteInt16( rBitmap.GetSizePixel().Width() ). WriteInt16( 0 ). WriteInt16( 0 ); +pWMF->WriteUInt32( nROP ). +WriteInt16( 0 ). +WriteInt16( rBitmap.GetSizePixel().Height() ). +WriteInt16( rBitmap.GetSizePixel().Width() ). +WriteInt16( 0 ). +WriteInt16( 0 ); WriteHeightWidth(rSize); WritePointYX(rPoint); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 96132] Enabling Experimental Features in the UI doesn't inform the user that LibO needs to be restarted
https://bugs.documentfoundation.org/show_bug.cgi?id=96132 Akshay Deep changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |akshaydeepi...@gmail.com |desktop.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: Branch 'libreoffice-5-0-5' - i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |1 +
i18nlangtag/source/isolang/isolang.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit edc44d944a3465c4387548d2ddd69ba1f67970fe
Author: Eike Rathke
Date: Fri Jan 22 22:30:39 2016 +0100
tdf#97315 forward compatibility for [eu-ES] mapping to [eu]
Commit 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0 maps [eu] to [eu-ES] for
5.2 (cherry-picked to 5.1), enable 5.0.5 to read that but still save
[eu].
Change-Id: I2aa82023a1ffb411c034beceb0bc999885adb026
Reviewed-on: https://gerrit.libreoffice.org/21728
Reviewed-by: Michael Stahl
Reviewed-by: Markus Mohrhard
Reviewed-by: David Ostrovsky
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index b76547c..f13863c 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -665,6 +665,7 @@ static bool checkMapping( const OUString& rStr1, const
OUString& rStr2 )
if (rStr1 == "ku-SY" ) return rStr2 == "kmr-Latn-SY";
if (rStr1 == "ku-IQ" ) return rStr2 == "ckb-IQ";
if (rStr1 == "ku-IR" ) return rStr2 == "ckb-IR";
+if (rStr1 == "eu-ES" ) return rStr2 == "eu";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index ee8406c..c56e14b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -240,6 +240,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ARABIC_SUDAN, "ar", "SD", 0 },
{ LANGUAGE_ARABIC_PRIMARY_ONLY, "ar", "" , 0 },
{ LANGUAGE_BASQUE, "eu", "" , 0 },
+{ LANGUAGE_BASQUE, "eu", "ES", kSAME },
{ LANGUAGE_BULGARIAN, "bg", "BG", 0 },
{ LANGUAGE_CZECH, "cs", "CZ", 0 },
{ LANGUAGE_CZECH, "cz", "" , kSAME },
___
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-5' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 320246d24d8a07cdb6b8400e8afa48696cc39343
Author: Tor Lillqvist
Date: Sun Oct 18 22:57:47 2015 +0300
tdf#97150: tdf#94924: If we can't handle strings, don't try to then
Fixes the VLOOKUP problem reported in tdf#94540 by falling back to
non-OpenCL for such a case, where one of the columns passed to the
VLOOKUP contained strings. And since a while, we don't claim to handle
strings in VLOOKUP. Which is true.
(cherry picked from commit 476bef70f1d9fd58b29a1f6fb95e54567b031acf)
Change-Id: I4140c86bf8166beb8201aa90c075d9f4432d9173
Reviewed-on: https://gerrit.libreoffice.org/21875
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Stahl
Reviewed-by: David Ostrovsky
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 2667f5d..4b8b50e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2659,6 +2659,13 @@
DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
new
DynamicKernelMixedSlidingArgument(mCalcConfig,
ts, ft->Children[i], mpCodeGen,
j)));
}
+else if
(!AllStringsAreNull(pDVR->GetArrays()[j].mpStringArray, pDVR->GetArrayLength())
&&
+ !pCodeGen->takeString())
+{
+// Can't handle
+SAL_INFO("sc.opencl", "Strings but can't do
that.");
+throw UnhandledToken(pChild, ("unhandled
operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
+}
else
{
// Not sure I can figure out what case this
exactly is;)
___
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-5' - include/xmloff sw/qa xmloff/source
include/xmloff/txtprmap.hxx|7 +-
sw/qa/extras/globalfilter/globalfilter.cxx | 80 +
xmloff/source/text/txtexppr.cxx| 10 +++
xmloff/source/text/txtprmap.cxx|4 -
4 files changed, 96 insertions(+), 5 deletions(-)
New commits:
commit 89aa74dd903a7919b33982bc2efc74c8ec902fdc
Author: Michael Stahl
Date: Tue Feb 2 14:10:02 2016 +0100
xmloff: tdf#96147: ODF export: fix duplicate fo:background-color
... attributes that happen if both CharHighlight and CharBackColor
properties are used, because the CharBackTransparent property wasn't
taken into account, and combining the CharBackColor and
CharBackTransparent properties happens *after*
XMLTextExportPropertySetMapper::ContextFilter() runs.
Also, it looks like a transparent highlight wouldn't export properly but
apparently DomainMapper::getColorFromId() won't create such.
(regression from f880962f5bf26bfaef06bd3f9e67e2d901a2e74c)
(cherry picked from commit 8dadefc35f8b33648fb6adbdaca75ea52b2705db)
Change-Id: Ib628ef8bb377482f74fadb97c81afb95fbbf7184
Reviewed-on: https://gerrit.libreoffice.org/22046
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit e92dcab1407fa26fc5ee68d0b626b87bc04f1b3b)
Reviewed-on: https://gerrit.libreoffice.org/22054
Reviewed-by: Markus Mohrhard
Reviewed-by: David Ostrovsky
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index 5fa8e3c..79baf8b 100644
--- a/include/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
@@ -197,9 +197,10 @@
#define CTF_RELWIDTHREL (XML_TEXT_CTF_START + 168)
#define CTF_RELHEIGHTREL(XML_TEXT_CTF_START + 169)
#define CTF_CHAR_BACKGROUND (XML_TEXT_CTF_START + 170)
-#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 171)
-#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 172)
-#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 173)
+#define CTF_CHAR_BACKGROUND_TRANSPARENCY(XML_TEXT_CTF_START + 171)
+#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 172)
+#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 173)
+#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 174)
enum class TextPropMap {
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index f2a7cf2..18e17e3 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -30,6 +30,7 @@ public:
void testImageWithSpecialID();
void testGraphicShape();
void testCharHighlight();
+void testCharHighlightODF();
void testCharHighlightBody();
void testMSCharBackgroundEditing();
void testCharBackgroundToHighlighting();
@@ -41,6 +42,7 @@ public:
CPPUNIT_TEST(testImageWithSpecialID);
CPPUNIT_TEST(testGraphicShape);
CPPUNIT_TEST(testCharHighlight);
+CPPUNIT_TEST(testCharHighlightODF);
CPPUNIT_TEST(testMSCharBackgroundEditing);
CPPUNIT_TEST(testCharBackgroundToHighlighting);
#if !defined(WNT)
@@ -471,6 +473,84 @@ void Test::testCharHighlight()
testCharHighlightBody();
}
+void Test::testCharHighlightODF()
+{
+mxComponent =
loadFromDesktop(getURLFromSrc("/sw/qa/extras/globalfilter/data/char_background_editing.docx"),
+ "com.sun.star.text.TextDocument");
+
+// don't check import, testMSCharBackgroundEditing already does that
+
+uno::Reference xPara = getParagraph(1);
+for (int i = 1; i <= 4; ++i)
+{
+uno::Reference xRun(getRun(xPara,i),
uno::UNO_QUERY);
+switch (i)
+{
+case 1: // non-transparent highlight
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(64)));
+break;
+
+case 2: // transparent backcolor
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(COL_TRANSPARENT)));
+break;
+
+case 3: // non-transparent backcolor
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(COL_TRANSPARENT)));
+break;
+
+case 4: // non-transparent highlight again
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(1
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-5' - editeng/source
editeng/source/editeng/impedit3.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 1d5a1f06c33bea1dd05fa6b03a02dce178578980
Author: Caolán McNamara
Date: Tue Feb 2 11:50:51 2016 +
Resolves: tdf#97375 use Invalidate in all modes
makes the crash/hangs go away
(cherry picked from commit ab5c427784fb72d52042b8122ffc5a0fd7108c6b)
(cherry picked from commit c3f09ae629b349c52a4a7954e3017ceb8d7afeaf)
Change-Id: I91a4391190ec7aa0ffa5e41a8c1eb86b4bb9c484
Reviewed-on: https://gerrit.libreoffice.org/22026
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 1b49e14c82af691fe1ec5aa5de8392350bce11a1)
Reviewed-on: https://gerrit.libreoffice.org/22056
Reviewed-by: David Ostrovsky
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index fb071e0..98e3d51 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -289,12 +289,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
{
// convert to window coordinates
aClipRect = pView->pImpEditView->GetWindowPos( aClipRect );
-
-// For tiled rendering, we have to always go via Invalidate().
-if ( pView == pCurView && !pView->isTiledRendering())
-Paint( pView->pImpEditView, aClipRect, 0, true );
-else
-pView->GetWindow()->Invalidate( aClipRect );
+pView->GetWindow()->Invalidate( aClipRect );
}
}
___
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-5' - svx/source
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b10af3417cb3cf8d99f30ff67661fa615f3bd56c
Author: Caolán McNamara
Date: Tue Jan 26 15:33:40 2016 +
Resolves: tdf#97276 don't clip out line if the underlying page size is
unknown
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
(cherry picked from commit ad99c633908f7c70d06812ebfb4e069f0158)
(cherry picked from commit 38b362c58abd0df654665956ffc751d40cfb67ab)
Reviewed-on: https://gerrit.libreoffice.org/21814
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 5f9a61e877d79cce1f99c05a9c1598a029bf2c1c)
Reviewed-on: https://gerrit.libreoffice.org/22058
Reviewed-by: Markus Mohrhard
Reviewed-by: David Ostrovsky
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index c44c6a2..f09a78d 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -91,15 +91,17 @@ namespace sdr
if(bIsLine)
{
const SdrPage* pPage = GetPathObj().GetPage();
-if (pPage)
+double fPageWidth = pPage ? pPage->GetWdt() : 0.0;
+double fPageHeight = pPage ? pPage->GetHgt() : 0.0;
+if (fPageWidth && fPageHeight)
{
//tdf#63955 if we have an extremely long line then clip it
//to a very generous range of -1 page width/height vs +1
//page width/height to avoid oom and massive churn
//generating a huge polygon chain to cover the length in
//applyLineDashing if this line is dashed
-double fPageWidth = pPage->GetWdt();
-double fPageHeight = pPage->GetHgt();
+//tdf#97276 don't clip if the underlying page dimension
+//is unknown
basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight,
fPageWidth*2, fPageHeight*2);
aUnitPolyPolygon =
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 96414] Remove feature to show Navigator during slideshow
https://bugs.documentfoundation.org/show_bug.cgi?id=96414 --- Comment #9 from Jean-Baptiste Faure --- (In reply to Bryan Quigley from comment #8) > (In reply to Jean-Baptiste Faure from comment #7) > > (In reply to Bryan Quigley from comment #6) > > > [...] > > > One thing I did notice (but it's in stable too). Is that the Navigator Pen > > > doesn't work. Should that just be removed too? > > > > What do you mean by "Navigator Pen"? The "Mouse pointer as pen" in the > > slideshow settings? It allows to write/draw on the slide during slideshow > > and it works as expected. > > > > Best regards. JBF > > If you open the Navigator (not in SlideShow mode) the first button in it is > "Pointer". I haven't been able to figure out what it should do or in what > case it's enabled. It seems it is another mean to activate the mouse pointer as pen. Indeed if you check the corresponding checkbox in the slideshow settings, then the button in the navigator become pressed or activated (not clear for me). To see that you should check the checkbox, launch the slideshow and exit it, then the button state has changed. Best regards. JBF -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 96414] Remove feature to show Navigator during slideshow
https://bugs.documentfoundation.org/show_bug.cgi?id=96414 --- Comment #8 from Bryan Quigley --- (In reply to Jean-Baptiste Faure from comment #7) > (In reply to Bryan Quigley from comment #6) > > [...] > > One thing I did notice (but it's in stable too). Is that the Navigator Pen > > doesn't work. Should that just be removed too? > > What do you mean by "Navigator Pen"? The "Mouse pointer as pen" in the > slideshow settings? It allows to write/draw on the slide during slideshow > and it works as expected. > > Best regards. JBF If you open the Navigator (not in SlideShow mode) the first button in it is "Pointer". I haven't been able to figure out what it should do or in what case it's enabled. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 96414] Remove feature to show Navigator during slideshow
https://bugs.documentfoundation.org/show_bug.cgi?id=96414 --- Comment #7 from Jean-Baptiste Faure --- (In reply to Bryan Quigley from comment #6) > [...] > One thing I did notice (but it's in stable too). Is that the Navigator Pen > doesn't work. Should that just be removed too? What do you mean by "Navigator Pen"? The "Mouse pointer as pen" in the slideshow settings? It allows to write/draw on the slide during slideshow and it works as expected. Best regards. JBF -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 87813] SIDEBAR: Incorporating the effects list into the animation tab
https://bugs.documentfoundation.org/show_bug.cgi?id=87813 Akshay Deep changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |akshaydeepi...@gmail.com |desktop.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
[Bug 95405] Kill focus-stealing search and replace dialog and make functionality available in a sidebar deck
https://bugs.documentfoundation.org/show_bug.cgi?id=95405 Akshay Deep changed: What|Removed |Added Status|ASSIGNED|NEW Assignee|akshaydeepi...@gmail.com|libreoffice-b...@lists.free ||desktop.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
[Bug 96414] Remove feature to show Navigator during slideshow
https://bugs.documentfoundation.org/show_bug.cgi?id=96414 --- Comment #6 from Bryan Quigley --- (In reply to Samuel Mehrbrodt from comment #4) > (In reply to Jean-Baptiste Faure from comment #3) > > Does this removing will concern the slides list available from the > > right-click menu in slideshow mode? > > That part should be retained. It is retained in the code I just posted - https://gerrit.libreoffice.org/#/c/22062/ One thing I did notice (but it's in stable too). Is that the Navigator Pen doesn't work. Should that just be removed too? -- 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: android/source
android/source/AndroidManifest.xml | 10 android/source/res/drawable/ic_menu_back.png |binary android/source/res/layout/activity_directory_browser.xml |6 android/source/res/layout/fragment_directory_browser.xml | 71 +++ android/source/res/values/strings.xml | 18 android/source/res/xml/documentprovider_preferences.xml | 13 android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java | 19 android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java | 41 +- android/source/src/java/org/libreoffice/storage/IOUtils.java | 59 ++ android/source/src/java/org/libreoffice/storage/external/BrowserSelectorActivity.java | 152 +++ android/source/src/java/org/libreoffice/storage/external/DirectoryBrowserActivity.java | 42 ++ android/source/src/java/org/libreoffice/storage/external/DirectoryBrowserFragment.java | 199 ++ android/source/src/java/org/libreoffice/storage/external/ExternalFile.java | 149 +++ android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java | 152 +++ android/source/src/java/org/libreoffice/storage/external/IExternalDocumentProvider.java | 19 android/source/src/java/org/libreoffice/storage/external/LegacyExtSDDocumentsProvider.java | 97 android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java | 84 17 files changed, 1125 insertions(+), 6 deletions(-) New commits: commit 1dfb68debb01dcc0aa5902f41bc17c7a97e47b26 Author: AlexF Date: Wed Dec 16 22:53:08 2015 +0800 tdf#88389 - android document browser: external storage access Background: External SD cards are only partially supported by the Android system, with a great deal of fragmentation on implementation across manufacturers and android versions. There is no official support for OTG devices. This commit adds: 1) External SD card support 2) OTG device support Caveats: 1) Not tested on Android 6. Emulator crashes when opening files on Android 6, using an unmodified build of the master branch. 2) OTG support currently works only if there is write access to the OTG directory. The user must be aware of exact OTG directory path or be able to navigate to it as well. 3) External SD card provider currently lacks file filtering. Approach: - Added new document providers. External SD cards: There are 2 different document providers external sd cards, one for Android 4.4 and above, and the other for older versions. 1) New Android 4.4 and above require usage of the DocumentFile wrapper class to access files in external storage. Actual file paths are no longer obtainable. As such, the underlying file will be cloned in a cache, allowing us to get an actual file path and use LOK. Some differences exist between 4.4 & 5+. The document provider handles each case separately. 2) Legacy Android 4.3 and below do not support the DocumentFile wrapper. File object can be used in these versions, allowing actual file paths to be obtained. The document provider guesses the root directory of the SD card. If the guessing fails, the user is to navigate to this directory himself. OTG: The OTG document provider resembles the legacy external SD card document provider, requiring the user to locate the directory himself. The document provider does not guess the root directory of the OTG device as the location varies with manufacturer implementation. - Supplementary Notes: Attempting to use the internal app cache as the file cache like in the ownCloud document provider did not work. Using the external app cache works fine though. It could be because initializing LOK wipes the internal app cache. Would be good to test the ownCloud document provider to confirm if it works. Change-Id: Ie727cca265107bc49ca7e7b57130470f7fc52e06 Reviewed-on: https://gerrit.libreoffice.org/20738 Reviewed-by: Tomaž Vajngerl Tested-by: Miklos Vajna diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index d49771a..25e8240 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -113,6 +113,16 @@ + + + + + + diff --git a/android/source/res/drawable/ic_menu_back.png b/android/source/res/drawable/ic_menu_back.png new file mode 100644 index 000..d3191ca Binary
Jochen Nitschke license statement
Hello, All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license and Apache License version 2.0. First Name: Jochen Last Name: Nitschke Git Email: j.nitschke+loger...@ok.de Regards Jochen Nitschke signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 12 -- 1 file changed, 12 deletions(-) New commits: commit 78d3ba011b8866416b59c2fdffa9ab0c16da9ed2 Author: Caolán McNamara Date: Tue Feb 2 12:52:10 2016 + Related: tdf#91909 home/end don't work in impress text boxes anymore partial revert of commit 9149dbf17329180e2c9e2fb39243c65acc07a182 Author: Yousuf Philips Date: Fri Nov 20 09:40:59 2015 +0400 tdf#91909 Add shortcuts to slide navigation to get home/end working in text boxes again Change-Id: I9960b94077c4c00d63483d3105d73f418cbcef0e (cherry picked from commit 758a50110aae8c0b339e3230b39f8d8343ce6bbc) Reviewed-on: https://gerrit.libreoffice.org/22032 Reviewed-by: Samuel Mehrbrodt Reviewed-by: Michael Stahl Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 44b5271..ab773b6 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2712,12 +2712,6 @@ .uno:SelectAll - - -I10N SHORTCUTS - NO TRANSLATE -.uno:LastPage - - I10N SHORTCUTS - NO TRANSLATE @@ -2852,12 +2846,6 @@ .uno:SuperScript - - -I10N SHORTCUTS - NO TRANSLATE -.uno:FirstPage - - I10N SHORTCUTS - NO TRANSLATE ___ 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' - extras/source
extras/source/autocorr/lang/pt/DocumentList.xml | 2690 1 file changed, 1430 insertions(+), 1260 deletions(-) New commits: commit 21f66a09625c207adab459287df5a84b00be017d Author: Marco A. G. Pinto Date: Tue Feb 2 08:44:39 2016 -0200 tdf#97439 Enhance pt-PT autocorrect file This patch adds 168 new entries to the pt-PT autocorrection. Change-Id: I8a9233cd0d1a2eeca5861c6ca51f3d2121053085 Reviewed-on: https://gerrit.libreoffice.org/22024 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit 33003d0fed4a5aaef4b631fcc3c0941f0eca34c9) Reviewed-on: https://gerrit.libreoffice.org/22061 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index 22c55b9..5bd26e5 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -1,1261 +1,1431 @@ - -http://openoffice.org/2001/block-list";> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uno/unotxdoc.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit bb01d7bc50e59eb30c0826a000ede52b93074f75
Author: Jan-Marek Glogowski
Date: Tue Feb 2 18:38:09 2016 +0100
tdf#97505 Account empty pages for print preview
Commit 1296f9dc9e502abd8422dfeee1ac7747a82aee17 was just a workaround
to fix the crash, while I couldn't find a way to get the layout from
the print preview, as all shells seemed empty. Took me a while to
realize the SwViewShell also has a layout, which is available, so we
can account for the empty pages correctly.
Change-Id: Icf0e9fdc0c1eeb6cadc48482595482545fd553e7
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index c42bcca..9c64773 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -189,30 +189,35 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions(
// Get current page number
sal_uInt16 nCurrentPage = 1;
-SwWrtShell* pSh = pDocShell->GetWrtShell();
+const SwWrtShell* pSh = pDocShell->GetWrtShell();
+const SwRootFrame *pFrame = nullptr;
if (pSh)
{
SwPaM* pShellCursor = pSh->GetCursor();
nCurrentPage = pShellCursor->GetPageNum();
+pFrame = pSh->GetLayout();
}
else if (!bSwSrcView)
{
const SwPagePreview* pPreview = dynamic_cast< const SwPagePreview*
>(pView);
OSL_ENSURE(pPreview, "Unexpected type of the view shell");
if (pPreview)
+{
nCurrentPage = pPreview->GetSelectedPage();
+pFrame = pPreview->GetViewShell()->GetLayout();
+}
}
// If blanks are skipped, account for them in initial page range value
-if (pSh && !rPrintData.IsPrintEmptyPages())
+if (pFrame && !rPrintData.IsPrintEmptyPages())
{
sal_uInt16 nMax = nCurrentPage;
-SwPageFrame *pPage =
dynamic_cast(pSh->GetLayout()->Lower());
+const SwPageFrame *pPage = dynamic_cast(pFrame->Lower());
for ( ; nMax-- > 0; )
{
if (pPage->Frame().Height() == 0)
nCurrentPage--;
-pPage = static_cast(pPage->GetNext());
+pPage = static_cast(pPage->GetNext());
}
}
return new SwPrintUIOptions( nCurrentPage, bWebDoc, bSwSrcView,
bHasSelection, bHasPostIts, rPrintData );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 5abe0ab18a10a3cb13485ce3ba9433bd82b32221
Author: Stephan Bergmann
Date: Tue Feb 2 18:19:54 2016 +0100
Avoid undefined out-of-bounds double -> sal_Int32 conversion
...upon empty rExtents, during "make Gallery_txtshapes"
Change-Id: Ie482041828b7abcf13d0efb5da62d1158b7f5e92
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index c72efca..edd230d 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1271,8 +1271,21 @@ cairo_user_data_key_t* SvpSalGraphics::getDamageKey()
void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed,
const basegfx::B2DRange& rExtents) const
{
-sal_Int32 nExtentsLeft(rExtents.getMinX()),
nExtentsTop(rExtents.getMinY());
-sal_Int32 nExtentsRight(rExtents.getMaxX()),
nExtentsBottom(rExtents.getMaxY());
+sal_Int32 nExtentsLeft;
+sal_Int32 nExtentsTop;
+sal_Int32 nExtentsRight;
+sal_Int32 nExtentsBottom;
+if (rExtents.isEmpty()) {
+nExtentsLeft = 0;
+nExtentsTop = 0;
+nExtentsRight = 0;
+nExtentsBottom = 0;
+} else {
+nExtentsLeft = rExtents.getMinX();
+nExtentsTop = rExtents.getMinY();
+nExtentsRight = rExtents.getMaxX();
+nExtentsBottom = rExtents.getMaxY();
+}
sal_Int32 nWidth = cairo_image_surface_get_width(m_pSurface);
sal_Int32 nHeight = cairo_image_surface_get_height(m_pSurface);
nExtentsLeft = std::max(nExtentsLeft, 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' - basebmp/inc
basebmp/inc/packedpixeliterator.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 7e0449ab6a45d3e50741e85175002cfa8e05da49 Author: Caolán McNamara Date: Tue Feb 2 14:40:43 2016 + error: left operand of shift expression '(-1 << 4)' is negative Change-Id: Id87fd266f8e27444cb0984c92921b6700f504042 Reviewed-on: https://gerrit.libreoffice.org/22047 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/basebmp/inc/packedpixeliterator.hxx b/basebmp/inc/packedpixeliterator.hxx index 776a45e..d7c6e62 100644 --- a/basebmp/inc/packedpixeliterator.hxx +++ b/basebmp/inc/packedpixeliterator.hxx @@ -78,7 +78,7 @@ public: num_intraword_positions=sizeof(value_type)*8/bits_per_pixel, /** Bit mask for one pixel (least significant bits) */ -bit_mask=~(~0 << bits_per_pixel) +bit_mask=~(~0U << bits_per_pixel) }; private: @@ -238,7 +238,7 @@ public: num_intraword_positions=sizeof(value_type)*8/bits_per_pixel, /** Bit mask for one pixel (least significant bits) */ -bit_mask=~(~0 << bits_per_pixel) +bit_mask=~(~0U << bits_per_pixel) }; private: @@ -477,7 +477,7 @@ public: num_intraword_positions=sizeof(value_type)*8/bits_per_pixel, /** Bit mask for one pixel (least significant bits) */ -bit_mask=~(~0 << bits_per_pixel) +bit_mask=~(~0U << bits_per_pixel) }; // TODO(F2): direction of iteration (ImageIterator can be made to ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 6f50edb1aabaf9de37782e63abd109e2276bd0c4
Author: Tor Lillqvist
Date: Sun Oct 18 22:57:47 2015 +0300
tdf#97150: tdf#94924: If we can't handle strings, don't try to then
Fixes the VLOOKUP problem reported in tdf#94540 by falling back to
non-OpenCL for such a case, where one of the columns passed to the
VLOOKUP contained strings. And since a while, we don't claim to handle
strings in VLOOKUP. Which is true.
(cherry picked from commit 476bef70f1d9fd58b29a1f6fb95e54567b031acf)
Change-Id: I4140c86bf8166beb8201aa90c075d9f4432d9173
Reviewed-on: https://gerrit.libreoffice.org/21874
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 2667f5d..4b8b50e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2659,6 +2659,13 @@
DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
new
DynamicKernelMixedSlidingArgument(mCalcConfig,
ts, ft->Children[i], mpCodeGen,
j)));
}
+else if
(!AllStringsAreNull(pDVR->GetArrays()[j].mpStringArray, pDVR->GetArrayLength())
&&
+ !pCodeGen->takeString())
+{
+// Can't handle
+SAL_INFO("sc.opencl", "Strings but can't do
that.");
+throw UnhandledToken(pChild, ("unhandled
operand " + StackVarEnumToString(pChild->GetType()) + " for ocPush").c_str());
+}
else
{
// Not sure I can figure out what case this
exactly is;)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/token.cxx | 102 ++
1 file changed, 93 insertions(+), 9 deletions(-)
New commits:
commit 406fdc37081a2bdbb4f15f80605f881105c15da0
Author: Eike Rathke
Date: Tue Jan 26 16:10:06 2016 +0100
Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta
(cherry picked from commit 02e69f0c3acec2c2e81692bc53c4356591a84ba5)
Conflicts:
sc/source/core/tool/token.cxx
Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27
Reviewed-on: https://gerrit.libreoffice.org/21821
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index d826454..4369017 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3320,17 +3320,33 @@ bool adjustDoubleRefInName(
ScComplexRefData& rRef, const sc::RefUpdateContext& rCxt, const ScAddress&
rPos )
{
bool bRefChanged = false;
-if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs() &&
!rRef.Ref1.IsRowRel() && !rRef.Ref2.IsRowRel())
+if (rCxt.mrDoc.IsExpandRefs())
{
-// Check and see if we should expand the range at the top.
-ScRange aSelectedRange = getSelectedRange(rCxt);
-ScRange aAbs = rRef.toAbs(rPos);
-if (aSelectedRange.Intersects(aAbs))
+if (rCxt.mnRowDelta > 0 && !rRef.Ref1.IsRowRel() &&
!rRef.Ref2.IsRowRel())
{
-// Selection intersects the referenced range. Only expand the
-// bottom position.
-rRef.Ref2.IncRow(rCxt.mnRowDelta);
-return true;
+// Check and see if we should expand the range at the top.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// bottom position.
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+return true;
+}
+}
+if (rCxt.mnColDelta > 0 && !rRef.Ref1.IsColRel() &&
!rRef.Ref2.IsColRel())
+{
+// Check and see if we should expand the range at the left.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// right position.
+rRef.Ref2.IncCol(rCxt.mnColDelta);
+return true;
+}
}
}
@@ -3465,6 +3481,62 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
aRes.mbReferenceModified = true;
}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsEntireRow())
+// Rows of entire rows are not affected.
+break;
+
+if (rRef.Ref1.IsColRel() || rRef.Ref2.IsColRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Row() < rCxt.maRange.aStart.Row()
|| rCxt.maRange.aEnd.Row() < aAbs.aEnd.Row())
+// row range of the reference is not entirely
in the deleted row range.
+break;
+
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncCol(rCxt.mnColDelta);
+
aDeleted.aEnd.SetCol(aDeleted.aStart.Col()-rCxt.mnColDelta-1);
+
+if (aAbs.aEnd.Col() < aDeleted.aStart.Col() ||
aDeleted.aEnd.Col() < aAbs.aStart.Col())
+// reference range doesn't intersect with the
deleted range.
+break;
+
+if (aDeleted.aStart.Col() <= aAbs.aStart.Col() &&
aAbs.aEnd.Col() <= aDeleted.aEnd.Col())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetColDeleted(true);
+rRef.Ref2.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Col() < aDeleted.aStart.Col())
+{
+if (aDeleted.aEnd.Col() < aAbs.aEnd.C
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 5f9a61e877d79cce1f99c05a9c1598a029bf2c1c
Author: Caolán McNamara
Date: Tue Jan 26 15:33:40 2016 +
Resolves: tdf#97276 don't clip out line if the underlying page size is
unknown
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
(cherry picked from commit ad99c633908f7c70d06812ebfb4e069f0158)
(cherry picked from commit 38b362c58abd0df654665956ffc751d40cfb67ab)
Reviewed-on: https://gerrit.libreoffice.org/21814
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index c44c6a2..f09a78d 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -91,15 +91,17 @@ namespace sdr
if(bIsLine)
{
const SdrPage* pPage = GetPathObj().GetPage();
-if (pPage)
+double fPageWidth = pPage ? pPage->GetWdt() : 0.0;
+double fPageHeight = pPage ? pPage->GetHgt() : 0.0;
+if (fPageWidth && fPageHeight)
{
//tdf#63955 if we have an extremely long line then clip it
//to a very generous range of -1 page width/height vs +1
//page width/height to avoid oom and massive churn
//generating a huge polygon chain to cover the length in
//applyLineDashing if this line is dashed
-double fPageWidth = pPage->GetWdt();
-double fPageHeight = pPage->GetHgt();
+//tdf#97276 don't clip if the underlying page dimension
+//is unknown
basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight,
fPageWidth*2, fPageHeight*2);
aUnitPolyPolygon =
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
___
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' - editeng/source
editeng/source/editeng/impedit3.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 1b49e14c82af691fe1ec5aa5de8392350bce11a1
Author: Caolán McNamara
Date: Tue Feb 2 11:50:51 2016 +
Resolves: tdf#97375 use Invalidate in all modes
makes the crash/hangs go away
(cherry picked from commit ab5c427784fb72d52042b8122ffc5a0fd7108c6b)
(cherry picked from commit c3f09ae629b349c52a4a7954e3017ceb8d7afeaf)
Change-Id: I91a4391190ec7aa0ffa5e41a8c1eb86b4bb9c484
Reviewed-on: https://gerrit.libreoffice.org/22026
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index fb071e0..98e3d51 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -289,12 +289,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
{
// convert to window coordinates
aClipRect = pView->pImpEditView->GetWindowPos( aClipRect );
-
-// For tiled rendering, we have to always go via Invalidate().
-if ( pView == pCurView && !pView->isTiledRendering())
-Paint( pView->pImpEditView, aClipRect, 0, true );
-else
-pView->GetWindow()->Invalidate( aClipRect );
+pView->GetWindow()->Invalidate( aClipRect );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cppcanvas/source cui/source drawinglayer/source filter/source include/basegfx oox/source svx/source vcl/headless vcl/quartz vcl/source vcl/win vcl/workben
cppcanvas/source/mtfrenderer/implrenderer.cxx |4 ++--
cui/source/tabpages/tpline.cxx |2 +-
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx |5 ++---
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |3 +--
filter/source/graphicfilter/eps/eps.cxx|2 +-
filter/source/msfilter/escherex.cxx|2 +-
filter/source/svg/svgwriter.cxx|4 ++--
include/basegfx/vector/b2enums.hxx | 10 +-
oox/source/export/drawingml.cxx|2 +-
svx/source/sdr/attribute/sdrformtextattribute.cxx |5 +
svx/source/sdr/primitive2d/sdrattributecreator.cxx |5 +
svx/source/sidebar/line/LinePropertyPanelBase.cxx |2 +-
svx/source/svdraw/svdfmtf.cxx |5 +
vcl/headless/svpgdi.cxx|4 +---
vcl/quartz/salgdicommon.cxx|1 -
vcl/source/gdi/pdfwriter_impl.cxx |3 +--
vcl/win/gdi/gdiimpl.cxx|3 +--
vcl/workben/vcldemo.cxx|8
18 files changed, 27 insertions(+), 43 deletions(-)
New commits:
commit 1d478d5b7ee71d991e6bb8b20cc0178ffec1d2e6
Author: Caolán McNamara
Date: Tue Feb 2 16:09:55 2016 +
use same cut-off width value for non-joining drawPolyLine as windows does
Change-Id: Ifc03da8ea65faca51ffa62fcee08fbcfacad6b20
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 9769f91..c72efca 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -690,8 +690,7 @@ bool SvpSalGraphics::drawPolyLine(
return true;
}
-// #i104886# linejoin-mode and thus the above only applies to "fat" lines
-bool bNoJoin = (basegfx::B2DLineJoin::NONE == eLineJoin &&
rLineWidths.getX() > 1.3);
+const bool bNoJoin = (basegfx::B2DLineJoin::NONE == eLineJoin &&
basegfx::fTools::more(rLineWidths.getX(), 0.0));
cairo_t* cr = getCairoContext(false);
clipRegion(cr);
commit c3cc55968eade5c03efca02d4f056b145cd89a70
Author: Caolán McNamara
Date: Tue Feb 2 15:47:41 2016 +
remove B2DLineJoin::Middle
and consistently map css::drawing::LineJoint_MIDDLE to the same thing that
css::drawing::LineJoint_MITRE points to everywhere else
Change-Id: I77b7586ea13f3fe84c052917275825488d36
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 31cd771..c07ee34 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -120,9 +120,9 @@ namespace
o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT;
o_rStrokeAttributes.EndCapType = rendering::PathCapType::BUTT;
-switch(rLineInfo.GetLineJoin())
+switch (rLineInfo.GetLineJoin())
{
-default: // B2DLineJoin::NONE, B2DLineJoin::Middle
+case basegfx::B2DLineJoin::NONE:
o_rStrokeAttributes.JoinType = rendering::PathJoinType::NONE;
break;
case basegfx::B2DLineJoin::Bevel:
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3f33c73..944b0a4 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1451,9 +1451,9 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
switch(eLineJoint)
{
case css::drawing::LineJoint_MAKE_FIXED_SIZE: // fallback to
round, unused value
-case css::drawing::LineJoint_MIDDLE : // fallback to round, unused
value
case css::drawing::LineJoint_ROUND :
m_pLBEdgeStyle->SelectEntryPos(0); break;
case css::drawing::LineJoint_NONE :
m_pLBEdgeStyle->SelectEntryPos(1); break;
+case css::drawing::LineJoint_MIDDLE : // fallback to mitre, unused
value
case css::drawing::LineJoint_MITER :
m_pLBEdgeStyle->SelectEntryPos(2); break;
case css::drawing::LineJoint_BEVEL :
m_pLBEdgeStyle->SelectEntryPos(3); break;
}
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 2148fa0..a6aa2cd 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -325,9 +325,8 @@ namespace drawinglayer
}
}
-if(basegfx::B2DLineJoin::Middle == aLineJoin
-|| basegfx::B2DLineJoin::Bevel == aLineJoin
-|| basegfx::B2DLineJoin::Miter == aLineJoin)
+if (basegfx::B2DLineJoin::Bevel == aLineJoin ||
+basegfx::B2DLineJoin::Mit
Re: building firebird fails without parallelism
On Mon, Feb 01, 2016 at 10:21:58AM +0100, Stephan Bergmann wrote: > On 01/30/2016 12:16 PM, Lionel Elie Mamane wrote: >> On Sat, Jan 30, 2016 at 08:42:54AM +0100, Jean-Baptiste Faure wrote: >>> It seems that the makefile generated to build Firebird in the master >>> does not like the --without-parallelism option of the autogen.sh. >> Fixed. Sorry for the regression. >> http://cgit.freedesktop.org/libreoffice/core/commit/?id=1e38737b72ab3c3b550675ece22130c07b14577a > I'm not aware of any other external modules where we explicitly pass down > the parallelism setting. If we did, running a top-level make could become > problematic for some, when the requested parallelism of N happens to result > in an effective parallelism of N^2. Just saying. Yes, you are right. I was lazy / approximate again. https://gerrit.libreoffice.org/22055 has a perhaps Rube Goldberg-esque attempt at making a system that makes it right :) -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: B2DLineJoin::Middle, drawPolyLine etc
On Tue, 2016-02-02 at 16:04 +0100, Armin Le Grand wrote: > Hi Caolan, > > In practise I know of no current usages - even on the UI that flag > is missing. If it can be removed (UNO API, ODF, ...), remove it. > checked once again: B2DLineJoin::Middle is sometimes mapped to > B2DLineJoin::NONE, sometimes to B2DLineJoin::Miter, both are nearly > equally often used. This should be unified, I would prefer mapping to > B2DLineJoin::Miter due to being graphically 'closer' to > B2DLineJoin::Middle than B2DLineJoin::NONE. ok, I'll remove basegfx::B2DLineJoin::Middle and map all css::drawing::LineJoin_MIDDLE to their css::drawing::LineJoin_MITRE equivalents. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 95405] Kill focus-stealing search and replace dialog and make functionality available in a sidebar deck
https://bugs.documentfoundation.org/show_bug.cgi?id=95405 Samuel Mehrbrodt changed: What|Removed |Added CC||79045_79...@mail.ru --- Comment #6 from Samuel Mehrbrodt --- *** Bug 96394 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 95405] Kill focus-stealing search and replace dialog and make functionality available in a sidebar deck
https://bugs.documentfoundation.org/show_bug.cgi?id=95405 Samuel Mehrbrodt changed: What|Removed |Added CC||samuel.mehrbr...@cib.de See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=96 ||394 -- 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: sw/qa
sw/qa/extras/globalfilter/globalfilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddd77c84cfeeef96eb8662b03fa29a8103ed559e
Author: Stephan Bergmann
Date: Tue Feb 2 16:53:23 2016 +0100
loplugin:stringconstant
Change-Id: Ie4554214e475da1bddba7ab0694ce23d1d93f06f
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 751f2a5..c68ddf7 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -516,7 +516,7 @@ void Test::testCharHighlightODF()
uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor["FilterName"] <<= OUString::createFromAscii("writer8");
+aMediaDescriptor["FilterName"] <<= OUString("writer8");
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/salgdi.h |2 +-
vcl/unx/generic/gdi/x11cairotextrender.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 773da02e8d2fc369c42eb2a799b41bf586acb4f5
Author: Stephan Bergmann
Date: Tue Feb 2 16:42:26 2016 +0100
loplugin:staticmethods
Change-Id: Iad54f114c6443950af4341e1d40dd7dcca9fb8d7
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 697a7ca..e8232f2 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -284,7 +284,7 @@ public:
voidYieldGraphicsExpose();
cairo_t* getCairoContext();
-void releaseCairoContext(cairo_t* cr);
+static void releaseCairoContext(cairo_t* cr);
// do XCopyArea or XGet/PutImage depending on screen numbers
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index a3973c8..cf8bc99 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -121,7 +121,7 @@ size_t X11CairoTextRender::GetHeight() const
void X11CairoTextRender::releaseCairoContext(cairo_t* cr)
{
-mrParent.releaseCairoContext(cr);
+X11SalGraphics::releaseCairoContext(cr);
}
/* 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: Branch 'feature/fixes14' - include/tools
include/tools/cpuid.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6760edb2482d562a657381cbf8e7ea7314e2f5df Author: Tor Lillqvist Date: Tue Feb 2 16:36:10 2016 +0200 Test for SSE2 at run-time on Windows To run on ancient CPUs, we compile for Windows with -arch:SSE since 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd (August 2014). Thus _M_IX86_FP gets defined as 1. This meant that LO_SSE2_AVAILABLE did not get defined, and that we hardcoded tools::cpuid::hasSSE2() as always returning false. That was hardly the intent. Change-Id: I7ee34510a774dab865c8990b74b91a5284218a96 (cherry picked from commit 4f68c279e4d81cd44ab14bcaf6da7d596a741971) diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx index f058f23..d7aa07d 100644 --- a/include/tools/cpuid.hxx +++ b/include/tools/cpuid.hxx @@ -16,7 +16,7 @@ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__) #define LO_SSE2_AVAILABLE 1 -#elif defined(_MSC_VER) && (defined(_M_AMD64) || (defined(_M_IX86) && defined(_M_IX86_FP) && _M_IX86_FP >= 2)) +#elif defined(_MSC_VER) #define LO_SSE2_AVAILABLE 1 #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools
include/tools/cpuid.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f68c279e4d81cd44ab14bcaf6da7d596a741971 Author: Tor Lillqvist Date: Tue Feb 2 16:36:10 2016 +0200 Test for SSE2 at run-time on Windows To run on ancient CPUs, we compile for Windows with -arch:SSE since 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd (August 2014). Thus _M_IX86_FP gets defined as 1. This meant that LO_SSE2_AVAILABLE did not get defined, and that we hardcoded tools::cpuid::hasSSE2() as always returning false. That was hardly the intent. Change-Id: I7ee34510a774dab865c8990b74b91a5284218a96 diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx index f058f23..d7aa07d 100644 --- a/include/tools/cpuid.hxx +++ b/include/tools/cpuid.hxx @@ -16,7 +16,7 @@ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__) #define LO_SSE2_AVAILABLE 1 -#elif defined(_MSC_VER) && (defined(_M_AMD64) || (defined(_M_IX86) && defined(_M_IX86_FP) && _M_IX86_FP >= 2)) +#elif defined(_MSC_VER) #define LO_SSE2_AVAILABLE 1 #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless vcl/quartz
vcl/headless/svpgdi.cxx |7 ---
vcl/quartz/salgdicommon.cxx |7 ---
2 files changed, 14 deletions(-)
New commits:
commit 4cbd8e7bf3e69cfda3d84e86f1adedac636a055e
Author: Caolán McNamara
Date: Mon Feb 1 18:19:32 2016 +
windows impl doesn't care if drawPolyLine LineWidth y != x
so I don't see that it makes much of a difference then
if the quartz or cairo one's don't either
Change-Id: Iabd65d617437aa747b910fcd2e84421413ed7db6
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 24220b7..fb7a0695 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -690,13 +690,6 @@ bool SvpSalGraphics::drawPolyLine(
return true;
}
-// reject requests that cannot be handled yet
-if (rLineWidths.getX() != rLineWidths.getY())
-{
-SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolyLine case");
-return false;
-}
-
// #i104886# linejoin-mode and thus the above only applies to "fat" lines
bool bNoJoin = (basegfx::B2DLineJoin::NONE == eLineJoin &&
rLineWidths.getX() > 1.3);
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 8a94e19..cf99909 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -973,13 +973,6 @@ bool AquaSalGraphics::drawPolyLine( const
basegfx::B2DPolygon& rPolyLine,
return true;
}
-// reject requests that cannot be handled yet
-if( rLineWidths.getX() != rLineWidths.getY() )
-{
-DBG_DRAW_OPERATION_EXIT_EARLY("drawPolyLine");
-return false;
-}
-
#ifdef IOS
if( !CheckContext() )
{
___
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' - include/xmloff sw/qa xmloff/source
include/xmloff/txtprmap.hxx|7 +-
sw/qa/extras/globalfilter/globalfilter.cxx | 80 +
xmloff/source/text/txtexppr.cxx| 10 +++
xmloff/source/text/txtprmap.cxx|4 -
4 files changed, 96 insertions(+), 5 deletions(-)
New commits:
commit e92dcab1407fa26fc5ee68d0b626b87bc04f1b3b
Author: Michael Stahl
Date: Tue Feb 2 14:10:02 2016 +0100
xmloff: tdf#96147: ODF export: fix duplicate fo:background-color
... attributes that happen if both CharHighlight and CharBackColor
properties are used, because the CharBackTransparent property wasn't
taken into account, and combining the CharBackColor and
CharBackTransparent properties happens *after*
XMLTextExportPropertySetMapper::ContextFilter() runs.
Also, it looks like a transparent highlight wouldn't export properly but
apparently DomainMapper::getColorFromId() won't create such.
(regression from f880962f5bf26bfaef06bd3f9e67e2d901a2e74c)
(cherry picked from commit 8dadefc35f8b33648fb6adbdaca75ea52b2705db)
Change-Id: Ib628ef8bb377482f74fadb97c81afb95fbbf7184
Reviewed-on: https://gerrit.libreoffice.org/22046
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index 5fa8e3c..79baf8b 100644
--- a/include/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
@@ -197,9 +197,10 @@
#define CTF_RELWIDTHREL (XML_TEXT_CTF_START + 168)
#define CTF_RELHEIGHTREL(XML_TEXT_CTF_START + 169)
#define CTF_CHAR_BACKGROUND (XML_TEXT_CTF_START + 170)
-#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 171)
-#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 172)
-#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 173)
+#define CTF_CHAR_BACKGROUND_TRANSPARENCY(XML_TEXT_CTF_START + 171)
+#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 172)
+#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 173)
+#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 174)
enum class TextPropMap {
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index f2a7cf2..18e17e3 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -30,6 +30,7 @@ public:
void testImageWithSpecialID();
void testGraphicShape();
void testCharHighlight();
+void testCharHighlightODF();
void testCharHighlightBody();
void testMSCharBackgroundEditing();
void testCharBackgroundToHighlighting();
@@ -41,6 +42,7 @@ public:
CPPUNIT_TEST(testImageWithSpecialID);
CPPUNIT_TEST(testGraphicShape);
CPPUNIT_TEST(testCharHighlight);
+CPPUNIT_TEST(testCharHighlightODF);
CPPUNIT_TEST(testMSCharBackgroundEditing);
CPPUNIT_TEST(testCharBackgroundToHighlighting);
#if !defined(WNT)
@@ -471,6 +473,84 @@ void Test::testCharHighlight()
testCharHighlightBody();
}
+void Test::testCharHighlightODF()
+{
+mxComponent =
loadFromDesktop(getURLFromSrc("/sw/qa/extras/globalfilter/data/char_background_editing.docx"),
+ "com.sun.star.text.TextDocument");
+
+// don't check import, testMSCharBackgroundEditing already does that
+
+uno::Reference xPara = getParagraph(1);
+for (int i = 1; i <= 4; ++i)
+{
+uno::Reference xRun(getRun(xPara,i),
uno::UNO_QUERY);
+switch (i)
+{
+case 1: // non-transparent highlight
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(64)));
+break;
+
+case 2: // transparent backcolor
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(COL_TRANSPARENT)));
+break;
+
+case 3: // non-transparent backcolor
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(COL_TRANSPARENT)));
+break;
+
+case 4: // non-transparent highlight again
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(64)));
+break;
+}
+}
+
+uno::Reference xStorable(mxComponent, uno::U
Re: B2DLineJoin::Middle, drawPolyLine etc
Hi Caolan, checked once again: B2DLineJoin::Middle is sometimes mapped to B2DLineJoin::NONE, sometimes to B2DLineJoin::Miter, both are nearly equally often used. This should be unified, I would prefer mapping to B2DLineJoin::Miter due to being graphically 'closer' to B2DLineJoin::Middle than B2DLineJoin::NONE. Also checked: Canvas in HTML5 also e.g. knows no 'none' state. With LineJoin probably all GraphicSystems are slightly different. Am 02.02.2016 um 15:46 schrieb Armin Le Grand: Hi Caolan, no, not an error, another simple LineJoin method which just takes the 'middle' of the points to be joined. LineJoins are for fat lines, so you have an inner and outer edge of the current and next segment. To join the points of the inner edges, these are added and divided by two, same for outer. I do not remember where that came from, but it was used in some graphic system and seemed a nice method for doing line joins. It should in practise not be used much and did not make it into current/modern systems, but is handled correctly e.g. in the primitive decomposition of fat lines. There are always exceptions in different systems, e.g. for DirectDraw on Win there is no B2DLineJoin::NONE, so this has to be painted by painting the single line segments. For a primitive renderer this means if there is no support for that style for the renderer you currently feed, use the decomposition :-) In practise I know of no current usages - even on the UI that flag is missing. If it can be removed (UNO API, ODF, ...), remove it. HTH! Am 02.02.2016 um 12:27 schrieb Caolán McNamara: What is B2DLineJoin::Middle supposed to be ? I see that the vcl pdf, windows and quartz backends treat ::Middle the same as ::Mitre (so I made the cairo one do the same) On the the other hand I see cppcanvas...setupStrokeAttributes and filter...ImplWriteLineInfo would default ::Middle to the same as ::NONE while cui...SvxLineTabPage::Reset and svx...LinePropertyPanelBase::updateLineJoint treat LineJoin_MIDDLE the same as ROUND but filter...EscherPropertyContainer::CreateLineProperties and oox...DrawingML::WriteOutline the same as BEVEL Is ::Middle a "mistake" and we should just treat it as ::Mitre everywhere ? Especially as that's what it turns into for the windows vcl drawPolyLine. Or is there some subtlety here ? C. -- -- ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/unx
vcl/headless/svpcairotextrender.cxx |2 +-
vcl/inc/headless/svpcairotextrender.hxx |2 +-
vcl/inc/unx/cairotextrender.hxx |2 +-
vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
vcl/unx/generic/gdi/openglx11cairotextrender.cxx |2 +-
vcl/unx/generic/gdi/openglx11cairotextrender.hxx |2 +-
vcl/unx/generic/gdi/x11cairotextrender.cxx |2 +-
vcl/unx/generic/gdi/x11cairotextrender.hxx |2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 11389cff11723c9f69317228cd2d6b1fef34b9aa
Author: Caolán McNamara
Date: Mon Feb 1 11:44:05 2016 +
rename drawSurface to releaseCairoContext
Change-Id: Ie5aac4a8b11daa2aba092923286fbbb2d76d4651
diff --git a/vcl/headless/svpcairotextrender.cxx
b/vcl/headless/svpcairotextrender.cxx
index 035a9cd..3109a75 100644
--- a/vcl/headless/svpcairotextrender.cxx
+++ b/vcl/headless/svpcairotextrender.cxx
@@ -36,7 +36,7 @@ void SvpCairoTextRender::clipRegion(cairo_t* cr)
mrParent.clipRegion(cr);
}
-void SvpCairoTextRender::drawSurface(cairo_t*)
+void SvpCairoTextRender::releaseCairoContext(cairo_t*)
{
}
diff --git a/vcl/inc/headless/svpcairotextrender.hxx
b/vcl/inc/headless/svpcairotextrender.hxx
index 9e3c837..dbd69b3 100644
--- a/vcl/inc/headless/svpcairotextrender.hxx
+++ b/vcl/inc/headless/svpcairotextrender.hxx
@@ -26,7 +26,7 @@ public:
virtual cairo_t* getCairoContext() override;
virtual void getSurfaceOffset(double& nDX, double& nDY) override;
virtual void clipRegion(cairo_t* cr) override;
-virtual void drawSurface(cairo_t* cr) override;
+virtual void releaseCairoContext(cairo_t* cr) override;
};
#endif
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 2402050..2de9b11 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -74,7 +74,7 @@ protected:
virtual GlyphCache& getPlatformGlyphCache() = 0;
virtual cairo_t*getCairoContext() = 0;
virtual voidgetSurfaceOffset(double& nDX, double& nDY) = 0;
-virtual voiddrawSurface(cairo_t* cr) = 0;
+virtual voidreleaseCairoContext(cairo_t* cr) = 0;
boolsetFont( const FontSelectPattern *pEntry, int
nFallbackLevel );
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 5ea9d3e..3c95849 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -345,7 +345,7 @@ void CairoTextRender::DrawServerFontLayout( const
ServerFontLayout& rLayout )
}
cairo_surface_flush(cairo_get_target(cr));
-drawSurface(cr);
+releaseCairoContext(cr);
cairo_destroy(cr);
}
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index 885145c..d5350e9 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -55,7 +55,7 @@ void OpenGLX11CairoTextRender::getSurfaceOffset( double& nDX,
double& nDY )
}
}
-void OpenGLX11CairoTextRender::drawSurface(cairo_t* cr)
+void OpenGLX11CairoTextRender::releaseCairoContext(cairo_t* cr)
{
// XXX: lfrb: GLES 2.0 doesn't support GL_UNSIGNED_INT_8_8_8_8_REV
OpenGLSalGraphicsImpl *pImpl = dynamic_cast< OpenGLSalGraphicsImpl*
>(mrParent.GetImpl());
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
index 9c6bd4d..46a11cb 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
@@ -19,7 +19,7 @@ public:
virtual cairo_t* getCairoContext() override;
virtual void getSurfaceOffset(double& nDX, double& nDY) override;
-virtual void drawSurface(cairo_t* cr) override;
+virtual void releaseCairoContext(cairo_t* cr) override;
};
#endif
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 17cb462..dc1797f 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -146,7 +146,7 @@ size_t X11CairoTextRender::GetHeight() const
return 1;
}
-void X11CairoTextRender::drawSurface(cairo_t* /*cr*/)
+void X11CairoTextRender::releaseCairoContext(cairo_t* /*cr*/)
{
}
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx
b/vcl/unx/generic/gdi/x11cairotextrender.hxx
index 0c66738..f614a4d 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx
@@ -43,7 +43,7 @@ public:
virtual cairo_t* getCairoContext() override;
virtual void getSurfaceOffset(double& nDX, double& nDY) override;
virtual void clipRegion(cairo_t* cr) override;
-virtual void drawSurface(cairo_t* cr) override;
+virtual void releaseCairoContext(cairo_t* cr) over
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/salgdi.h |4 +++
vcl/unx/generic/gdi/salgdi.cxx | 17 +++
vcl/unx/generic/gdi/x11cairotextrender.cxx | 31 +
3 files changed, 23 insertions(+), 29 deletions(-)
New commits:
commit 5a8ec16bf5b51af826ed98644021cd2290747f6f
Author: Caolán McNamara
Date: Mon Feb 1 12:38:52 2016 +
move getCairoContext from X11CairoTextRender to X11SalGraphics
and simplify a little bit
Change-Id: I5a2faeb7e22ee5a0eaa4f05bc73fd92cbe2f5083
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index d2cee20..697a7ca 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -283,6 +283,10 @@ public:
*/
voidYieldGraphicsExpose();
+cairo_t* getCairoContext();
+void releaseCairoContext(cairo_t* cr);
+
+
// do XCopyArea or XGet/PutImage depending on screen numbers
// signature is like XCopyArea with screen numbers added
static void CopyScreenArea(
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index fc8554b..7bc1719 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -64,6 +64,7 @@
#include "xrender_peer.hxx"
#include "cairo_cairo.hxx"
#include "cairo_xlib_cairo.hxx"
+#include
#include
@@ -564,4 +565,20 @@ SalGeometryProvider *X11SalGraphics::GetGeometryProvider()
const
return static_cast< SalGeometryProvider * >(m_pVDev);
}
+cairo_t* X11SalGraphics::getCairoContext()
+{
+cairo_surface_t* surface = cairo_xlib_surface_create(GetXDisplay(),
hDrawable_,
+GetVisual().visual, SAL_MAX_INT16, SAL_MAX_INT16);
+
+cairo_t *cr = cairo_create(surface);
+cairo_surface_destroy(surface);
+
+return cr;
+}
+
+void X11SalGraphics::releaseCairoContext(cairo_t* cr)
+{
+ cairo_destroy(cr);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 5a2b095..a3973c8 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -25,10 +25,6 @@
#include "gcach_xpeer.hxx"
#include
-#include
-
-#include
-#include
struct BOX
{
@@ -58,30 +54,7 @@ GlyphCache& X11CairoTextRender::getPlatformGlyphCache()
cairo_t* X11CairoTextRender::getCairoContext()
{
-// find a XRenderPictFormat compatible with the Drawable
-XRenderPictFormat* pVisualFormat = mrParent.GetXRenderFormat();
-
-Display* pDisplay = mrParent.GetXDisplay();
-
-cairo_surface_t* surface = nullptr;
-if (pVisualFormat)
-{
-surface = cairo_xlib_surface_create_with_xrender_format (
-pDisplay, mrParent.hDrawable_,
-ScreenOfDisplay(pDisplay,
mrParent.m_nXScreen.getXScreen()),
-pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
-}
-else
-{
-surface = cairo_xlib_surface_create(pDisplay, mrParent.hDrawable_,
-mrParent.GetVisual().visual, SAL_MAX_INT16, SAL_MAX_INT16);
-}
-
-if (!surface)
-return nullptr;
-
-cairo_t *cr = cairo_create(surface);
-cairo_surface_destroy(surface);
+cairo_t *cr = mrParent.getCairoContext();
//rhbz#1283420 bodge to draw and undraw something which has the side effect
//of making the mysterious xrender related problem go away
@@ -148,7 +121,7 @@ size_t X11CairoTextRender::GetHeight() const
void X11CairoTextRender::releaseCairoContext(cairo_t* cr)
{
-cairo_destroy(cr);
+mrParent.releaseCairoContext(cr);
}
/* 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: vcl/headless vcl/unx
vcl/headless/svpcairotextrender.cxx |4 +++-
vcl/unx/generic/gdi/cairotextrender.cxx |2 --
vcl/unx/generic/gdi/openglx11cairotextrender.cxx |6 ++
vcl/unx/generic/gdi/x11cairotextrender.cxx |3 ++-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 1a1ee2f6e5b8215ad5f7bcdcb13f5fdce5784b2e
Author: Caolán McNamara
Date: Mon Feb 1 12:08:43 2016 +
move CairoTextRender cleanup to callers
so releaseCairoContext is a mirror of getCairoContext, so callers that don't
need to flush can drop that explicit call
Not sure, now that I see it, how there's been no sign of any problem with no
damage of the affected text area under gtk3
Change-Id: I8e508160be4102c64a0ecdf5591b6999f9171c36
diff --git a/vcl/headless/svpcairotextrender.cxx
b/vcl/headless/svpcairotextrender.cxx
index 3109a75..9468793 100644
--- a/vcl/headless/svpcairotextrender.cxx
+++ b/vcl/headless/svpcairotextrender.cxx
@@ -9,6 +9,7 @@
#include "headless/svpcairotextrender.hxx"
#include "headless/svpgdi.hxx"
+#include
SvpCairoTextRender::SvpCairoTextRender(SvpSalGraphics& rParent)
: mrParent(rParent)
@@ -36,8 +37,9 @@ void SvpCairoTextRender::clipRegion(cairo_t* cr)
mrParent.clipRegion(cr);
}
-void SvpCairoTextRender::releaseCairoContext(cairo_t*)
+void SvpCairoTextRender::releaseCairoContext(cairo_t* cr)
{
+mrParent.releaseCairoContext(cr, false, basegfx::B2DRange());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 3c95849..747791d 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -344,9 +344,7 @@ void CairoTextRender::DrawServerFontLayout( const
ServerFontLayout& rLayout )
aI = aNext;
}
-cairo_surface_flush(cairo_get_target(cr));
releaseCairoContext(cr);
-cairo_destroy(cr);
}
const FontCharMapPtr CairoTextRender::GetFontCharMap() const
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index d5350e9..0c8ac0d 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -60,11 +60,15 @@ void OpenGLX11CairoTextRender::releaseCairoContext(cairo_t*
cr)
// XXX: lfrb: GLES 2.0 doesn't support GL_UNSIGNED_INT_8_8_8_8_REV
OpenGLSalGraphicsImpl *pImpl = dynamic_cast< OpenGLSalGraphicsImpl*
>(mrParent.GetImpl());
if(!pImpl)
+{
+cairo_destroy(cr);
return;
+}
cairo_surface_t* pSurface = cairo_get_target(cr);
int nWidth = cairo_image_surface_get_width( pSurface );
int nHeight = cairo_image_surface_get_height( pSurface );
+cairo_surface_flush(pSurface);
unsigned char *pSrc = cairo_image_surface_get_data( pSurface );
// XXX: lfrb: GLES 2.0 doesn't support GL_UNSIGNED_INT_8_8_8_8_REV
@@ -78,6 +82,8 @@ void OpenGLX11CairoTextRender::releaseCairoContext(cairo_t*
cr)
pImpl->PreDraw();
pImpl->DrawAlphaTexture( aTexture, aRect, true, true );
pImpl->PostDraw();
+
+cairo_destroy(cr);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index dc1797f..5a2b095 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -146,8 +146,9 @@ size_t X11CairoTextRender::GetHeight() const
return 1;
}
-void X11CairoTextRender::releaseCairoContext(cairo_t* /*cr*/)
+void X11CairoTextRender::releaseCairoContext(cairo_t* cr)
{
+cairo_destroy(cr);
}
/* 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: editeng/source
editeng/source/editeng/impedit.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit c3224db8baa443253584954d1d54651c9d863304
Author: Caolán McNamara
Date: Tue Feb 2 14:51:02 2016 +
Related: tdf#97375 a cut doesn't refresh the editview
but a delete does. The diff from delete to cut is the
EnterBlockNotifications/LeaveBlockNotifications calls so try that
Change-Id: I10147043d6fe358bf2f4f4bd6877210b86cbbd1f
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 36bd526..8e9f48c 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1403,12 +1403,13 @@ void ImpEditView::CutCopy( css::uno::Reference<
css::datatransfer::clipboard::XC
}
-if ( bCut )
+if (bCut)
{
-pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_CUT );
+pEditEngine->pImpEditEngine->EnterBlockNotifications();
+pEditEngine->pImpEditEngine->UndoActionStart(EDITUNDO_CUT);
DeleteSelected();
-pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_CUT );
-
+pEditEngine->pImpEditEngine->UndoActionEnd(EDITUNDO_CUT);
+pEditEngine->pImpEditEngine->LeaveBlockNotifications();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/itemconnect.hxx | 28 ++--
sfx2/source/dialog/itemconnect.cxx | 34 +-
sfx2/source/dialog/tabdlg.cxx |4 ++--
3 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 72c1fb8c3c6be3c75b9cb26755adafb7d58b10b0
Author: Stephan Bergmann
Date: Tue Feb 2 15:46:33 2016 +0100
Avoid unncessary, premature null deref
...when SfxTabPage::Reset (sfx2/source/dialog/tabdlg.cxx) calls into
DoApplyFlags/DoRest with a null rSet (but which apparently isn't actually
used
then), e.g. upon "File - Export as PDF..." in Impress.
Change-Id: Ie2f255694212356fa8fc994287c45f2b4730a5bd
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index ae265b7..a414b46 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -184,9 +184,9 @@ public:
boolIsActive() const;
/** Calls the virtual ApplyFlags() function, if connection is active. */
-voidDoApplyFlags( const SfxItemSet& rItemSet );
+voidDoApplyFlags( const SfxItemSet* pItemSet );
/** Calls the virtual Reset() function, if connection is active. */
-voidDoReset( const SfxItemSet& rItemSet );
+voidDoReset( const SfxItemSet* pItemSet );
/** Calls the virtual FillItemSet() function, if connection is active. */
boolDoFillItemSet( SfxItemSet& rDestSet, const SfxItemSet&
rOldSet );
@@ -194,9 +194,9 @@ protected:
explicitItemConnectionBase( ItemConnFlags nFlags =
ITEMCONN_DEFAULT );
/** Derived classes implement actions according to current flags here. */
-virtual voidApplyFlags( const SfxItemSet& rItemSet ) = 0;
+virtual voidApplyFlags( const SfxItemSet* pItemSet ) = 0;
/** Derived classes implement initializing controls from item sets here. */
-virtual voidReset( const SfxItemSet& rItemSet ) = 0;
+virtual voidReset( const SfxItemSet* pItemSet ) = 0;
/** Derived classes implement filling item sets from controls here. */
virtual boolFillItemSet( SfxItemSet& rDestSet, const SfxItemSet&
rOldSet ) = 0;
@@ -252,9 +252,9 @@ public:
protected:
/** Actions according to current flags for the control. */
-virtual voidApplyFlags( const SfxItemSet& rItemSet ) override;
+virtual voidApplyFlags( const SfxItemSet* pItemSet ) override;
/** Resets the control according to the item contents. */
-virtual voidReset( const SfxItemSet& rItemSet ) override;
+virtual voidReset( const SfxItemSet* pItemSet ) override;
/** Fills the item set according to the control's state. */
virtual boolFillItemSet( SfxItemSet& rDestSet, const SfxItemSet&
rOldSet ) override;
@@ -281,8 +281,8 @@ public:
ItemConnFlags nFlags = ITEMCONN_DEFAULT );
protected:
-virtual voidApplyFlags( const SfxItemSet& rItemSet ) override;
-virtual voidReset( const SfxItemSet& rItemSet ) override;
+virtual voidApplyFlags( const SfxItemSet* pItemSet ) override;
+virtual voidReset( const SfxItemSet* pItemSet ) override;
virtual boolFillItemSet( SfxItemSet& rDestSet, const SfxItemSet&
rOldSet ) override;
private:
@@ -421,8 +421,8 @@ public:
voidAddConnection( ItemConnectionBase* pConnection );
protected:
-virtual voidApplyFlags( const SfxItemSet& rItemSet ) override;
-virtual voidReset( const SfxItemSet& rItemSet ) override;
+virtual voidApplyFlags( const SfxItemSet* pItemSet ) override;
+virtual voidReset( const SfxItemSet* pItemSet ) override;
virtual boolFillItemSet( SfxItemSet& rDestSet, const SfxItemSet&
rOldSet ) override;
private:
@@ -463,16 +463,16 @@ ItemControlConnection< ItemWrpT, ControlWrpT
>::~ItemControlConnection()
}
template< typename ItemWrpT, typename ControlWrpT >
-void ItemControlConnection< ItemWrpT, ControlWrpT >::ApplyFlags( const
SfxItemSet& rItemSet )
+void ItemControlConnection< ItemWrpT, ControlWrpT >::ApplyFlags( const
SfxItemSet* pItemSet )
{
-bool bKnown = ItemWrapperHelper::IsKnownItem( rItemSet,
maItemWrp.GetSlotId() );
+bool bKnown = ItemWrapperHelper::IsKnownItem( *pItemSet,
maItemWrp.GetSlotId() );
mxCtrlWrp->ModifyControl( GetEnableState( bKnown ), GetShowState( bKnown )
);
}
template< typename ItemWrpT, typename ControlWrpT >
-void ItemControlConnection< ItemWrpT, ControlWrpT >::Reset( const SfxItemSet&
rItemSet )
+void ItemControlConnection< ItemWrpT, ControlWrpT >::Reset( const SfxItemSet*
pItemSet )
{
-const ItemType* pItem = maItemWrp.GetUniqueItem( rItemSet );
+const ItemType* pItem = maItemWrp.GetUniqueItem( *pItemSet );
mxCtrlWrp->SetControlDontKnow( pItem == nullptr );
if( pItem )
Re: B2DLineJoin::Middle, drawPolyLine etc
Hi Caolan, no, not an error, another simple LineJoin method which just takes the 'middle' of the points to be joined. LineJoins are for fat lines, so you have an inner and outer edge of the current and next segment. To join the points of the inner edges, these are added and divided by two, same for outer. I do not remember where that came from, but it was used in some graphic system and seemed a nice method for doing line joins. It should in practise not be used much and did not make it into current/modern systems, but is handled correctly e.g. in the primitive decomposition of fat lines. There are always exceptions in different systems, e.g. for DirectDraw on Win there is no B2DLineJoin::NONE, so this has to be painted by painting the single line segments. For a primitive renderer this means if there is no support for that style for the renderer you currently feed, use the decomposition :-) In practise I know of no current usages - even on the UI that flag is missing. If it can be removed (UNO API, ODF, ...), remove it. HTH! Am 02.02.2016 um 12:27 schrieb Caolán McNamara: What is B2DLineJoin::Middle supposed to be ? I see that the vcl pdf, windows and quartz backends treat ::Middle the same as ::Mitre (so I made the cairo one do the same) On the the other hand I see cppcanvas...setupStrokeAttributes and filter...ImplWriteLineInfo would default ::Middle to the same as ::NONE while cui...SvxLineTabPage::Reset and svx...LinePropertyPanelBase::updateLineJoint treat LineJoin_MIDDLE the same as ROUND but filter...EscherPropertyContainer::CreateLineProperties and oox...DrawingML::WriteOutline the same as BEVEL Is ::Middle a "mistake" and we should just treat it as ::Mitre everywhere ? Especially as that's what it turns into for the windows vcl drawPolyLine. Or is there some subtlety here ? C. -- -- ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/styledlg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 869c73d0d2512e483ceedcc895b7cb86e0974ab2
Author: Oliver Specht
Date: Tue Feb 2 10:44:40 2016 +0100
tdf#97051: prevent duplicate copy of SfxItemSet
the patch f7424ed710e54bb2437a28380b03ed7c26290edc introduced copying of
the input item set of SfxTabDialog so now the item set of the style must
not be copied anymore.
Change-Id: If4155ee5999f0c5cd2ac754578a2c1b5ec33b14b
Reviewed-on: https://gerrit.libreoffice.org/22022
Reviewed-by: Oliver Specht
Tested-by: Oliver Specht
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index ecf57a6..e2ed267 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -43,7 +43,7 @@ SfxStyleDialog::SfxStyleDialog
*/
: SfxTabDialog(pParent, rID, rUIXMLDescription,
- rStyle.GetItemSet().Clone(), true)
+ &rStyle.GetItemSet(), true)
, pStyle( &rStyle )
{
___
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' - framework/source
framework/source/uielement/popuptoolbarcontroller.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit d6c4c28f75c755df1e1fa7df67eeadba78d66785
Author: Maxim Monastirsky
Date: Thu Jan 28 21:30:06 2016 +0200
tdf#97419 Need to take SolarMutex here
Change-Id: I97886c8dbd7b56d155ad9598ca127df0c7420d2c
(cherry picked from commit 49e1a1a4f5591faaca61559e6492909faf1bc94d)
Reviewed-on: https://gerrit.libreoffice.org/22034
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 6b9c552..ace6884 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -402,6 +402,7 @@ void SaveToolbarController::functionSelected( const
OUString& /*aCommand*/ )
void SaveToolbarController::updateImage()
throw ( css::uno::RuntimeException, std::exception )
{
+SolarMutexGuard aGuard;
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
if ( !getToolboxId( nId, &pToolBox ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 88502] User selection of Firefox theme by pasting URL in UI is not possible
https://bugs.documentfoundation.org/show_bug.cgi?id=88502 --- Comment #22 from Yousuf (Jay) Philips --- Created attachment 122330 --> https://bugs.documentfoundation.org/attachment.cgi?id=122330&action=edit patch attempt This was a patch i attempted to create to solve this issue but never got around to test it but believe it needs more 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
[Bug 91054] cleanup weirdo function prototypes ...
https://bugs.documentfoundation.org/show_bug.cgi?id=91054 Commit Notification changed: What|Removed |Added Whiteboard|target:5.0.0 target:5.1.0 |target:5.0.0 target:5.1.0 ||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
[Bug 91054] cleanup weirdo function prototypes ...
https://bugs.documentfoundation.org/show_bug.cgi?id=91054 --- Comment #7 from Commit Notification --- irem committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=e1cd15fbac8727627c06e7a1e7c00691c66b0a11 tdf#91054 cleanup weirdo function prototypes 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
[Libreoffice-commits] core.git: chart2/inc
chart2/inc/ChartModel.hxx | 90 +++--- 1 file changed, 30 insertions(+), 60 deletions(-) New commits: commit e1cd15fbac8727627c06e7a1e7c00691c66b0a11 Author: irem Date: Mon Feb 1 12:05:37 2016 +0200 tdf#91054 cleanup weirdo function prototypes Change-Id: I9bc2ed0acdd9770777b04fa75372fd794d8494d7 Reviewed-on: https://gerrit.libreoffice.org/21990 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index b473205..fa099df 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -177,8 +177,7 @@ private: OUString impl_g_getLocation(); bool -impl_isControllerConnected( const com::sun::star::uno::Reference< -com::sun::star::frame::XController >& xController ); +impl_isControllerConnected( const com::sun::star::uno::Reference< com::sun::star::frame::XController >& xController ); com::sun::star::uno::Reference< com::sun::star::frame::XController > impl_getCurrentController() @@ -195,22 +194,15 @@ private: throw(::com::sun::star::uno::RuntimeException); void impl_store( -const ::com::sun::star::uno::Sequence< -::com::sun::star::beans::PropertyValue >& rMediaDescriptor, -const ::com::sun::star::uno::Reference< -::com::sun::star::embed::XStorage > & xStorage ); +const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor, +const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage ); void impl_load( -const ::com::sun::star::uno::Sequence< -::com::sun::star::beans::PropertyValue >& rMediaDescriptor, -const ::com::sun::star::uno::Reference< -::com::sun::star::embed::XStorage >& xStorage ); +const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor, +const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); void impl_loadGraphics( -const ::com::sun::star::uno::Reference< -::com::sun::star::embed::XStorage >& xStorage ); -::com::sun::star::uno::Reference< -::com::sun::star::document::XFilter > -impl_createFilter( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > & rMediaDescriptor ); +const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); +::com::sun::star::uno::Reference< ::com::sun::star::document::XFilter > +impl_createFilter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & rMediaDescriptor ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > impl_createDefaultChartTypeTemplate(); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > impl_createDefaultData(); @@ -222,8 +214,7 @@ private: public: //no default constructor -ChartModel(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext); +ChartModel(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); explicit ChartModel( const ChartModel & rOther ); virtual ~ChartModel(); @@ -247,8 +238,7 @@ public: virtual sal_Bool SAL_CALL attachResource( const OUString& rURL -, const ::com::sun::star::uno::Sequence< -::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) +, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL @@ -258,13 +248,11 @@ public: getArgs() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL -connectController( const ::com::sun::star::uno::Reference< -::com::sun::star::frame::XController >& xController ) +connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL -disconnectController( const ::com::sun::star::uno::Reference< -::com::sun::star::frame::XController >& xController ) +disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_
[Libreoffice-commits] core.git: include/xmloff sw/qa xmloff/source
include/xmloff/txtprmap.hxx|7 +-
sw/qa/extras/globalfilter/globalfilter.cxx | 80 +
xmloff/source/text/txtexppr.cxx| 10 +++
xmloff/source/text/txtprmap.cxx|4 -
4 files changed, 96 insertions(+), 5 deletions(-)
New commits:
commit 8dadefc35f8b33648fb6adbdaca75ea52b2705db
Author: Michael Stahl
Date: Tue Feb 2 14:10:02 2016 +0100
xmloff: tdf#96147: ODF export: fix duplicate fo:background-color
... attributes that happen if both CharHighlight and CharBackColor
properties are used, because the CharBackTransparent property wasn't
taken into account, and combining the CharBackColor and
CharBackTransparent properties happens *after*
XMLTextExportPropertySetMapper::ContextFilter() runs.
Also, it looks like a transparent highlight wouldn't export properly but
apparently DomainMapper::getColorFromId() won't create such.
(regression from f880962f5bf26bfaef06bd3f9e67e2d901a2e74c)
Change-Id: Ib628ef8bb377482f74fadb97c81afb95fbbf7184
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index 5fa8e3c..79baf8b 100644
--- a/include/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
@@ -197,9 +197,10 @@
#define CTF_RELWIDTHREL (XML_TEXT_CTF_START + 168)
#define CTF_RELHEIGHTREL(XML_TEXT_CTF_START + 169)
#define CTF_CHAR_BACKGROUND (XML_TEXT_CTF_START + 170)
-#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 171)
-#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 172)
-#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 173)
+#define CTF_CHAR_BACKGROUND_TRANSPARENCY(XML_TEXT_CTF_START + 171)
+#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 172)
+#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 173)
+#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 174)
enum class TextPropMap {
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 1871c61..751f2a5 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -30,6 +30,7 @@ public:
void testImageWithSpecialID();
void testGraphicShape();
void testCharHighlight();
+void testCharHighlightODF();
void testCharHighlightBody();
void testMSCharBackgroundEditing();
void testCharBackgroundToHighlighting();
@@ -43,6 +44,7 @@ public:
CPPUNIT_TEST(testImageWithSpecialID);
CPPUNIT_TEST(testGraphicShape);
CPPUNIT_TEST(testCharHighlight);
+CPPUNIT_TEST(testCharHighlightODF);
CPPUNIT_TEST(testMSCharBackgroundEditing);
CPPUNIT_TEST(testCharBackgroundToHighlighting);
#if !defined(WNT)
@@ -473,6 +475,84 @@ void Test::testCharHighlight()
testCharHighlightBody();
}
+void Test::testCharHighlightODF()
+{
+mxComponent =
loadFromDesktop(getURLFromSrc("/sw/qa/extras/globalfilter/data/char_background_editing.docx"),
+ "com.sun.star.text.TextDocument");
+
+// don't check import, testMSCharBackgroundEditing already does that
+
+uno::Reference xPara = getParagraph(1);
+for (int i = 1; i <= 4; ++i)
+{
+uno::Reference xRun(getRun(xPara,i),
uno::UNO_QUERY);
+switch (i)
+{
+case 1: // non-transparent highlight
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(64)));
+break;
+
+case 2: // transparent backcolor
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(COL_TRANSPARENT)));
+break;
+
+case 3: // non-transparent backcolor
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(COL_TRANSPARENT)));
+break;
+
+case 4: // non-transparent highlight again
+xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast(128)));
+xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
+xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast(64)));
+break;
+}
+}
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString::createFromAscii("writer8");
+
+utl::TempFile aTempFile;
+aTempFile.EnableKillin
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 12 -- 1 file changed, 12 deletions(-) New commits: commit 19d4cf5dcb45c1b8722f218f85dcd08530539804 Author: Caolán McNamara Date: Tue Feb 2 12:52:10 2016 + Related: tdf#91909 home/end don't work in impress text boxes anymore partial revert of commit 9149dbf17329180e2c9e2fb39243c65acc07a182 Author: Yousuf Philips Date: Fri Nov 20 09:40:59 2015 +0400 tdf#91909 Add shortcuts to slide navigation to get home/end working in text boxes again Change-Id: I9960b94077c4c00d63483d3105d73f418cbcef0e (cherry picked from commit 758a50110aae8c0b339e3230b39f8d8343ce6bbc) Reviewed-on: https://gerrit.libreoffice.org/22030 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 44b5271..ab773b6 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2712,12 +2712,6 @@ .uno:SelectAll - - -I10N SHORTCUTS - NO TRANSLATE -.uno:LastPage - - I10N SHORTCUTS - NO TRANSLATE @@ -2852,12 +2846,6 @@ .uno:SuperScript - - -I10N SHORTCUTS - NO TRANSLATE -.uno:FirstPage - - I10N SHORTCUTS - NO TRANSLATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70998] Termchange: Graphic/Picture -> Image
https://bugs.documentfoundation.org/show_bug.cgi?id=70998 Samuel Mehrbrodt changed: What|Removed |Added CC||qui...@gmail.com --- Comment #35 from Samuel Mehrbrodt --- (In reply to Yousuf (Jay) Philips from comment #34) > @Samuel: It would be good to double check whether 'Graphics Cache' used in > the options dialog memory page means only images, as it may also include > charts, etc. Tomaz, can you comment on this? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 95408] "Toggle" in Writer Navigator should be more explicit in what it toggles
https://bugs.documentfoundation.org/show_bug.cgi?id=95408 Samuel Mehrbrodt changed: What|Removed |Added Status|ASSIGNED|RESOLVED CC||samuel.mehrbr...@cib.de 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
[Bug 70998] Termchange: Graphic/Picture -> Image
https://bugs.documentfoundation.org/show_bug.cgi?id=70998 --- Comment #34 from Yousuf (Jay) Philips --- @Samuel: It would be good to double check whether 'Graphics Cache' used in the options dialog memory page means only images, as it may also include charts, etc. -- 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: svtools/source
svtools/source/control/inettbc.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 98183c3381ef20c32285027662d7ac4bab23038f
Author: Stephan Bergmann
Date: Tue Feb 2 14:23:01 2016 +0100
...these args are all default ones
Change-Id: I40b7635d45178760e2fdb81a6c2d910414455352
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 330a7c7c..f86a8f1 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -515,14 +515,10 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText,
const OUString& _aBaseUR
// take base URL and append current input
bool bWasAbsolute = false;
#ifdef UNX
-INetURLObject::FSysStyle eStyle = static_cast<
INetURLObject::FSysStyle >( INetURLObject::FSYS_VOS | INetURLObject::FSYS_UNX |
INetURLObject::FSYS_DOS );
// encode file URL correctly
aSmart = INetURLObject::encode( aSmart, INetURLObject::PART_FPATH,
INetURLObject::ENCODE_ALL );
-INetURLObject aTmp( aObj.smartRel2Abs(
-aSmart, bWasAbsolute, false, INetURLObject::WAS_ENCODED,
RTL_TEXTENCODING_UTF8, false, eStyle ) );
-#else
-INetURLObject aTmp( aObj.smartRel2Abs( aSmart, bWasAbsolute ) );
#endif
+INetURLObject aTmp( aObj.smartRel2Abs( aSmart, bWasAbsolute ) );
if ( aText.endsWith(".") )
// INetURLObject appends a final slash for the directories "."
and "..", this is a bug!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Bug 38808] Removal of ATL dependency on Windows
On Tue, Feb 2, 2016 at 3:06 AM, Chris Sherlock wrote: > > This is interesting... > > Do we still want to use ATL? > the main reason to get rid o f it was because it required a paid/expensive version of Visual Studio to use/compile. With the community edition that aspect is moot.. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 21 commits - bean/BUCK bean/com bin/mvn.py bridges/source BUCK .buckconfig .buckversion framework/source .gitignore include/xmloff ja
.buckconfig | 13 .buckversion |1 .gitignore |2 BUCK | 59 bean/BUCK| 23 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |2 bean/com/sun/star/comp/beans/OOoBean.java| 24 bin/mvn.py | 60 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 12 framework/source/fwe/xml/menudocumenthandler.cxx |8 include/xmloff/txtimp.hxx|3 javaunohelper/BUCK | 20 jurt/BUCK| 21 oox/source/drawingml/shape.cxx |2 readlicense_oo/license/CREDITS.fodt | 2809 +-- ridljar/BUCK | 20 ridljar/source/unoloader/BUCK| 20 sc/source/core/data/conditio.cxx |4 sc/source/core/tool/sharedformula.cxx| 12 sc/source/ui/app/inputhdl.cxx|3 solenv/bin/version.py| 49 solenv/buck/build.defs | 49 solenv/maven/BUCK| 41 solenv/maven/README.md | 373 ++ solenv/maven/VERSION |7 solenv/maven/mvn.py | 77 solenv/maven/package.defs| 28 sw/inc/IDocumentMarkAccess.hxx |2 sw/inc/globals.hrc |6 sw/qa/extras/odfexport/odfexport.cxx |4 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|2 sw/qa/extras/ooxmlimport/data/tdf95213.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 sw/qa/extras/rtfimport/data/tdf96308-tabpos.rtf | 12 sw/qa/extras/rtfimport/rtfimport.cxx | 16 sw/source/core/doc/docbm.cxx |6 sw/source/core/inc/MarkManager.hxx |2 sw/source/core/text/itrpaint.cxx | 19 sw/source/core/text/porlin.hxx |1 sw/source/core/unocore/unobkm.cxx|9 sw/source/ui/frmdlg/frmui.src| 19 sw/source/uibase/dbui/dbmgr.cxx | 15 sw/source/uibase/shells/frmsh.cxx| 26 unoil/BUCK | 21 vcl/source/filter/igif/gifread.cxx | 29 vcl/source/filter/wmf/enhwmf.cxx |6 vcl/source/filter/wmf/winmtf.cxx | 10 vcl/source/filter/wmf/winmtf.hxx |2 vcl/source/filter/wmf/winwmf.cxx |4 vcl/source/window/winproc.cxx| 14 vcl/unx/generic/printer/cupsmgr.cxx |7 vcl/unx/generic/printer/jobdata.cxx |2 writerfilter/source/dmapper/DomainMapper.cxx |4 writerfilter/source/dmapper/DomainMapper.hxx |2 writerfilter/source/dmapper/NumberingManager.cxx |2 writerfilter/source/dmapper/StyleSheetTable.cxx |5 writerfilter/source/dmapper/StyleSheetTable.hxx |2 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 xmloff/source/core/xmlexp.cxx| 29 xmloff/source/core/xmlimp.cxx|2 xmloff/source/text/XMLTextMarkImportContext.cxx | 46 xmloff/source/text/XMLTextMarkImportContext.hxx |6 xmloff/source/text/txtimp.cxx| 60 xmloff/source/text/txtparai.cxx | 40 64 files changed, 2587 insertions(+), 1603 deletions(-) New commits: commit 63bc23bbdc2f2bdbe7360e9c8f832b7427c0ae50 Author: Miklos Vajna Date: Fri Jan 8 11:23:48 2016 +0100 tdf#96308 RTF import: fix tab stop inheritance inside table cells The tab stop list is a paragraph property, and RTF requires to repeat it after \s as direct formatting, otherwise the parser should be assumed that the tab stop list is cleared as a direct formatting. Non-buffered text handles that in getDefaultSPRM(), handle it directly in the RTF_PARD code for buffered text. (cherry picked from commit 1ec88cdb82a28851c4b97d7f043d8bcec3c675e8) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I16b09bc4c177df5a74d16653b829b198aa1a800f Reviewed-on: https://gerrit.libreoffice.org/21996 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit cb64c29389939048666141eb4dddcfae4dd7
[Libreoffice-commits] core.git: Changes to 'feature/cairo'
New branch 'feature/cairo' available with the following commits: ___ 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
loleaflet/src/layer/tile/TileLayer.js | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 11e5c5abebbb9575e86ec438434abb90ca80f370
Author: Miklos Vajna
Date: Tue Feb 2 14:08:18 2016 +0100
loleaflet: initial support for the clientvisiblearea command
This is enough, so that e.g. pagedown jumps down about a visual page
correctly.
Areas where this could be improved further in the future:
- Currently the visual area is only updated on zoom change. Perhaps it
would be better to update it when the visual area really changes, i.e.
on scroll or resize. But the cost of this only makes sense if
something on the server side needs the correct position or width as
well, not only the height (as pgdown does).
- Currently the visual area is sent only before a key command (if it's
dirty), is there a use-case when sending it also before e.g. a mouse
click is also useful?
(cherry picked from commit 1e3432b7e9674b72a8ae28867fa311614116fc59)
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 832f531..220efc8 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -124,6 +124,8 @@ L.TileLayer = L.GridLayer.extend({
'tilepixelheight=' + this.options.tileSize + ' ' +
'tiletwipwidth=' + this.options.tileWidthTwips + ' ' +
'tiletwipheight=' + this.options.tileHeightTwips;
+ // Mark visible area as dirty by default.
+ this._clientVisibleArea = true;
},
onAdd: function (map) {
@@ -777,6 +779,16 @@ L.TileLayer = L.GridLayer.extend({
this._map._socket.sendMessage('clientzoom ' +
this._clientZoom);
this._clientZoom = null;
}
+ if (this._clientVisibleArea) {
+ // Visible area is dirty, update it on the server.
+ var visibleArea =
this._map._container.getBoundingClientRect();
+ var pos = this._pixelsToTwips(new
L.Point(visibleArea.left, visibleArea.top));
+ var size = this._pixelsToTwips(new
L.Point(visibleArea.width, visibleArea.height));
+ var payload = 'clientvisiblearea x=' +
Math.round(pos.x) + ' y=' + Math.round(pos.y) +
+ ' width=' + Math.round(size.x) + ' height=' +
Math.round(size.y);
+ this._map._socket.sendMessage(payload);
+ this._clientVisibleArea = null;
+ }
this._map._socket.sendMessage('key type=' + type +
' char=' + charcode + ' key=' + keycode);
},
@@ -1256,6 +1268,8 @@ L.TileLayer = L.GridLayer.extend({
'tilepixelheight=' + this._tileSize + ' ' +
'tiletwipwidth=' + this._tileWidthTwips + ' ' +
'tiletwipheight=' + this._tileHeightTwips;
+ // Zoom changed, mark visible area as dirty.
+ this._clientVisibleArea = true;
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 1e3432b7e9674b72a8ae28867fa311614116fc59
Author: Miklos Vajna
Date: Tue Feb 2 14:08:18 2016 +0100
loleaflet: initial support for the clientvisiblearea command
This is enough, so that e.g. pagedown jumps down about a visual page
correctly.
Areas where this could be improved further in the future:
- Currently the visual area is only updated on zoom change. Perhaps it
would be better to update it when the visual area really changes, i.e.
on scroll or resize. But the cost of this only makes sense if
something on the server side needs the correct position or width as
well, not only the height (as pgdown does).
- Currently the visual area is sent only before a key command (if it's
dirty), is there a use-case when sending it also before e.g. a mouse
click is also useful?
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 832f531..220efc8 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -124,6 +124,8 @@ L.TileLayer = L.GridLayer.extend({
'tilepixelheight=' + this.options.tileSize + ' ' +
'tiletwipwidth=' + this.options.tileWidthTwips + ' ' +
'tiletwipheight=' + this.options.tileHeightTwips;
+ // Mark visible area as dirty by default.
+ this._clientVisibleArea = true;
},
onAdd: function (map) {
@@ -777,6 +779,16 @@ L.TileLayer = L.GridLayer.extend({
this._map._socket.sendMessage('clientzoom ' +
this._clientZoom);
this._clientZoom = null;
}
+ if (this._clientVisibleArea) {
+ // Visible area is dirty, update it on the server.
+ var visibleArea =
this._map._container.getBoundingClientRect();
+ var pos = this._pixelsToTwips(new
L.Point(visibleArea.left, visibleArea.top));
+ var size = this._pixelsToTwips(new
L.Point(visibleArea.width, visibleArea.height));
+ var payload = 'clientvisiblearea x=' +
Math.round(pos.x) + ' y=' + Math.round(pos.y) +
+ ' width=' + Math.round(size.x) + ' height=' +
Math.round(size.y);
+ this._map._socket.sendMessage(payload);
+ this._clientVisibleArea = null;
+ }
this._map._socket.sendMessage('key type=' + type +
' char=' + charcode + ' key=' + keycode);
},
@@ -1256,6 +1268,8 @@ L.TileLayer = L.GridLayer.extend({
'tilepixelheight=' + this._tileSize + ' ' +
'tiletwipwidth=' + this._tileWidthTwips + ' ' +
'tiletwipheight=' + this._tileHeightTwips;
+ // Zoom changed, mark visible area as dirty.
+ this._clientVisibleArea = true;
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 12 -- 1 file changed, 12 deletions(-) New commits: commit 758a50110aae8c0b339e3230b39f8d8343ce6bbc Author: Caolán McNamara Date: Tue Feb 2 12:52:10 2016 + Related: tdf#91909 home/end don't work in impress text boxes anymore partial revert of commit 9149dbf17329180e2c9e2fb39243c65acc07a182 Author: Yousuf Philips Date: Fri Nov 20 09:40:59 2015 +0400 tdf#91909 Add shortcuts to slide navigation to get home/end working in text boxes again Change-Id: I9960b94077c4c00d63483d3105d73f418cbcef0e diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 44b5271..ab773b6 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2712,12 +2712,6 @@ .uno:SelectAll - - -I10N SHORTCUTS - NO TRANSLATE -.uno:LastPage - - I10N SHORTCUTS - NO TRANSLATE @@ -2852,12 +2846,6 @@ .uno:SuperScript - - -I10N SHORTCUTS - NO TRANSLATE -.uno:FirstPage - - I10N SHORTCUTS - NO TRANSLATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Zoom.js |4 ++--
loleaflet/src/map/Map.js |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 876a04cb3101e779e01dbbcd127db6ff8a36187d
Author: Marco Cecchetti
Date: Tue Feb 2 13:37:37 2016 +0100
loleaflet - now only zoomlevelchange trigger _updateDisabled
Earlier both 'zoomend' and 'zoomlevelchange' triggered
Control.Zoom._updateDisabled.
Removing 'zoomend' let us fire 'zoomlevelchange' when the zoom level
is set (map.setZoom).
Change-Id: Ifde4977f39ca924bbcb7621d16f6169088d2c608
diff --git a/loleaflet/src/control/Control.Zoom.js
b/loleaflet/src/control/Control.Zoom.js
index c3a38d4..837dfaa 100644
--- a/loleaflet/src/control/Control.Zoom.js
+++ b/loleaflet/src/control/Control.Zoom.js
@@ -26,13 +26,13 @@ L.Control.Zoom = L.Control.extend({
zoomName + '-out', container, this._zoomOut);
this._updateDisabled();
- map.on('zoomend zoomlevelschange', this._updateDisabled, this);
+ map.on('zoomlevelschange', this._updateDisabled, this);
return container;
},
onRemove: function (map) {
- map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+ map.off('zoomlevelschange', this._updateDisabled, this);
},
disable: function () {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6549514..c2ec720 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -568,6 +568,7 @@ L.Map = L.Evented.extend({
if (zoomChanged || afterZoomAnim) {
this.fire('zoomend');
+ this.fire('zoomlevelschange');
}
this.fire('moveend', {hard: !preserveMapOffset});
___
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
loleaflet/src/control/Control.Zoom.js |4 ++--
loleaflet/src/map/Map.js |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a4cbb4a381836a288bad0b74697fe41617a9be18
Author: Marco Cecchetti
Date: Tue Feb 2 13:37:37 2016 +0100
loleaflet - now only zoomlevelchange trigger _updateDisabled
Earlier both 'zoomend' and 'zoomlevelchange' triggered
Control.Zoom._updateDisabled.
Removing 'zoomend' let us fire 'zoomlevelchange' when the zoom level
is set (map.setZoom).
Change-Id: Ifde4977f39ca924bbcb7621d16f6169088d2c608
diff --git a/loleaflet/src/control/Control.Zoom.js
b/loleaflet/src/control/Control.Zoom.js
index c3a38d4..837dfaa 100644
--- a/loleaflet/src/control/Control.Zoom.js
+++ b/loleaflet/src/control/Control.Zoom.js
@@ -26,13 +26,13 @@ L.Control.Zoom = L.Control.extend({
zoomName + '-out', container, this._zoomOut);
this._updateDisabled();
- map.on('zoomend zoomlevelschange', this._updateDisabled, this);
+ map.on('zoomlevelschange', this._updateDisabled, this);
return container;
},
onRemove: function (map) {
- map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+ map.off('zoomlevelschange', this._updateDisabled, this);
},
disable: function () {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6549514..c2ec720 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -568,6 +568,7 @@ L.Map = L.Evented.extend({
if (zoomChanged || afterZoomAnim) {
this.fire('zoomend');
+ this.fire('zoomlevelschange');
}
this.fire('moveend', {hard: !preserveMapOffset});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 95408] "Toggle" in Writer Navigator should be more explicit in what it toggles
https://bugs.documentfoundation.org/show_bug.cgi?id=95408 --- Comment #3 from Commit Notification --- akki95 committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=20e2d7e7d1c518fe514e8252836c1c728fe3fc27 tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it toggles 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
[Bug 95408] "Toggle" in Writer Navigator should be more explicit in what it toggles
https://bugs.documentfoundation.org/show_bug.cgi?id=95408 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
[Bug 87813] SIDEBAR: Incorporating the effects list into the animation tab
https://bugs.documentfoundation.org/show_bug.cgi?id=87813 Samuel Mehrbrodt changed: What|Removed |Added Keywords||topicUI -- 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: sw/source
sw/source/uibase/utlui/navipi.cxx |3 +++
sw/source/uibase/utlui/navipi.src |4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27
Author: akki95
Date: Sat Jan 30 09:55:41 2016 +0530
tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it
toggles
Bug resolved. Removed toggle button from non-master documents.
Toggle button working for master documents only.
Changed toggle button tooltip to "Toggle Master View"
Change-Id: I7b77bae812ac208b0b93fff9e114b063d2ae2520
Reviewed-on: https://gerrit.libreoffice.org/21913
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index de53270..b87f144 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -705,6 +705,9 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
m_aContentToolBox->InsertSeparator(4);
m_aContentToolBox->SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
m_aContentToolBox->ShowItem( FN_PAGENUMBER );
+if(!IsGlobalDoc()){
+m_aContentToolBox->HideItem( FN_GLOBAL_SWITCH );
+}
for( sal_uInt16 i = 0; i <= static_cast(RegionMode::EMBEDDED);
i++ )
{
diff --git a/sw/source/uibase/utlui/navipi.src
b/sw/source/uibase/utlui/navipi.src
index aaa15cd..01cfa8b 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -82,7 +82,7 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_GLOBAL_SWITCH ;
HelpID = HID_NAVI_TBX17 ;
-Text [ en-US ] = "Toggle" ;
+Text [ en-US ] = "Toggle Master View" ;
};
ToolBoxItem
{
@@ -215,7 +215,7 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_GLOBAL_SWITCH ;
HelpID = HID_NAVI_TBX17 ;
-Text [ en-US ] = "Toggle" ;
+Text [ en-US ] = "Toggle Master View" ;
};
ToolBoxItem
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70998] Termchange: Graphic/Picture -> Image
https://bugs.documentfoundation.org/show_bug.cgi?id=70998 --- Comment #33 from Commit Notification --- akki95 committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=a78f074a0b0be4577ffd9bbf4fe00cc7f06ee9bb tdf#70998 Termchange: Graphic/Picture->Image 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
[Bug 70998] Termchange: Graphic/Picture -> Image
https://bugs.documentfoundation.org/show_bug.cgi?id=70998 Commit Notification changed: What|Removed |Added Whiteboard|target:4.2.0 target:4.3.0 |target:4.2.0 target:4.3.0 |target:4.4.0 target:5.1.0 |target:4.4.0 target:5.1.0 ||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
[Libreoffice-commits] core.git: rsc/source
rsc/source/rscpp/cpp4.c |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 4120449c863c7ec01f5098f04be1af15a326a5b2
Author: Stephan Bergmann
Date: Tue Feb 2 13:39:40 2016 +0100
Compiler warning battle
...where 05642b446c39c1551d2d703be18158c7ae0f0c36
"-Werror,-Wconstant-conversion
(from 255 to -1)" caused MSVC to counter with "warning C4310: cast truncates
constant value"
Change-Id: I7d80825a01e49817d7989e00774fed1f162dea85
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index 98ec8a3..eab7b15 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -277,7 +277,14 @@ void stparmscan(int delim)
{
#ifdef SOLAR
*wp++ = DEL;
-*wp++ = (char)(MAC_PARM + PAR_MAC); /* Stuff a magic marker */
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wconstant-conversion"
+#endif
+*wp++ = MAC_PARM + PAR_MAC; /* Stuff a magic marker */
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
*wp++ = (char)(i + MAC_PARM); /* Make a formal marker */
*wp = wp[-4]; /* Add on closing quote */
workp = wp + 1; /* Reset string end */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/qa cui/uiconfig officecfg/registry sw/uiconfig
configmgr/qa/unit/data.xcd |4 ++-- cui/uiconfig/ui/optmemorypage.ui |2 +- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu |2 +- sw/uiconfig/swriter/ui/printoptionspage.ui |2 +- sw/uiconfig/swriter/ui/viewoptionspage.ui|2 +- 6 files changed, 7 insertions(+), 7 deletions(-) New commits: commit a78f074a0b0be4577ffd9bbf4fe00cc7f06ee9bb Author: akki95 Date: Thu Jan 28 05:47:22 2016 +0530 tdf#70998 Termchange: Graphic/Picture->Image Changed visible terms as required. Change-Id: Id4335629977aa8512c753241d7c2203820716b73 Reviewed-on: https://gerrit.libreoffice.org/21857 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index 8453c3b..4cc86ab 100644 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -1834,7 +1834,7 @@ - Graphics mode + Image mode 1 @@ -3840,7 +3840,7 @@ - Presentation Graphic Options + Presentation Image Options diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index 691c8f2..072f9b5 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -185,7 +185,7 @@ True False -Graphics Cache +Image Cache diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 3c59b24..89220a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1883,7 +1883,7 @@ - Graphics mode + Image mode 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu index 1c49f22..3d70f1c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu @@ -121,7 +121,7 @@ - Graphic... + Image.. diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index 95e5ae2..255cbea 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -34,7 +34,7 @@ 6 -_Pictures and objects +_Images and objects True True False diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui index 834d15a..bf48688 100644 --- a/sw/uiconfig/swriter/ui/viewoptionspage.ui +++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui @@ -94,7 +94,7 @@ 6 -_Graphics and objects +_Images and objects True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit libreofficekit/qa libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitGtk.h | 12 ++
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 50 +
libreofficekit/source/gtk/lokdocview.cxx| 109 +++-
3 files changed, 166 insertions(+), 5 deletions(-)
New commits:
commit 18fbddcca569c109ca2f46f7d791187e672d4d83
Author: Pranav Kant
Date: Wed Jan 27 16:56:14 2016 +0530
lokdocview: Handle password protected documents
Change-Id: I606a1112c8eb4c1cc4596d6947ce1223543cc87c
Reviewed-on: https://gerrit.libreoffice.org/21861
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index c3e4b28..229bac0 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -286,6 +286,18 @@ gbooleanlok_doc_view_paste
(LOKDocView*
gsize
nSize);
/**
+ * lok_doc_view_set_document_password:
+ * @pDocView: The #LOKDocView instance
+ * @pUrl: the URL of the document to set password for, as sent with signal
`password-required`
+ * @pPassword: (nullable): the password, NULL for no password
+ *
+ * Set the password for password protected documents
+ */
+voidlok_doc_view_set_document_password
(LOKDocView* pDocView,
+const
gchar* pURL,
+const
gchar* pPassword);
+
+/**
* lok_doc_view_pixel_to_twip:
* @pDocView: The #LOKDocView instance
* @fInput: The value in pixels to convert to twips
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 45ac17e..c294430 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -486,10 +486,20 @@ static void toggleFindbar(GtkWidget* pButton, gpointer
/*pItem*/)
}
}
+static void
+setLOKFeatures (GtkWidget* pDocView)
+{
+g_object_set(G_OBJECT(pDocView),
+ "doc-password", TRUE,
+ "doc-password-to-modify", TRUE,
+ nullptr);
+}
+
/// Common initialization, regardless if it's just a new view or a full init.
static TiledWindow& setupWidgetAndCreateWindow(GtkWidget* pDocView)
{
setupDocView(pDocView);
+setLOKFeatures(pDocView);
TiledWindow aWindow;
aWindow.m_pDocView = pDocView;
GtkWidget* pWindow = createWindow(aWindow);
@@ -861,6 +871,45 @@ static void formulaChanged(LOKDocView* pLOKDocView, char*
pPayload, gpointer /*p
gtk_entry_set_text(GTK_ENTRY(rWindow.m_pFormulabarEntry), pPayload);
}
+/// LOKDocView password is requried to open the document
+static void passwordRequired(LOKDocView* pLOKDocView, gchar* pUrl, gboolean
bModify, gpointer /*pData*/)
+{
+GtkWidget* pPasswordDialog = gtk_dialog_new_with_buttons ("Password
required",
+ GTK_WINDOW
(gtk_widget_get_toplevel(GTK_WIDGET(pLOKDocView))),
+ GTK_DIALOG_MODAL,
+ "OK",
+ GTK_RESPONSE_OK,
+ nullptr);
+g_object_set(G_OBJECT(pPasswordDialog), "resizable", FALSE, nullptr);
+GtkWidget* pDialogMessageArea = gtk_dialog_get_content_area (GTK_DIALOG
(pPasswordDialog));
+GtkWidget* pPasswordEntry = gtk_entry_new ();
+gtk_entry_set_visibility (GTK_ENTRY(pPasswordEntry), FALSE);
+gtk_entry_set_invisible_char (GTK_ENTRY(pPasswordEntry), '*');
+gtk_box_pack_end(GTK_BOX(pDialogMessageArea), pPasswordEntry, TRUE, TRUE,
2);
+if (bModify)
+{
+GtkWidget* pSecondaryLabel = gtk_label_new ("Document requires
password to edit");
+gtk_box_pack_end(GTK_BOX(pDialogMessageArea), pSecondaryLabel, TRUE,
TRUE, 2);
+gtk_dialog_add_button (GTK_DIALOG (pPasswordDialog), "Open as
read-only", GTK_RESPONSE_ACCEPT);
+}
+gtk_widget_show_all(pPasswordDialog);
+
+gint res = gtk_dialog_run (GTK_DIALOG(pPasswordDialog));
+switch (res)
+{
+case GTK_RESPONSE_OK:
+lok_doc_view_set_document_password (pLOKDocView, pUrl,
gtk_entry_get_text(GTK_ENTRY(pPasswordEntry)));
+break;
+case GTK_RESPONSE_ACCEPT:
+// User accepts to open this document as read-only
+case GTK_RESPONSE_DELETE_EVENT:
+lok_doc_view_set_document_password (pLOKDocView, pUrl, nullptr);
+break;
+}
+
+gtk_widget_destroy(pPasswordDialog);
+}
+
static void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
{
TiledWindow& rWindow = lcl_getTiledWindow(pWid
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/tdf96308-tabpos.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx| 16
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 ++
3 files changed, 30 insertions(+)
New commits:
commit cb64c29389939048666141eb4dddcfae4dd70ee5
Author: Miklos Vajna
Date: Fri Jan 8 11:23:48 2016 +0100
tdf#96308 RTF import: fix tab stop inheritance inside table cells
The tab stop list is a paragraph property, and RTF requires to repeat it
after \s as direct formatting, otherwise the parser should be assumed
that the tab stop list is cleared as a direct formatting.
Non-buffered text handles that in getDefaultSPRM(), handle it directly
in the RTF_PARD code for buffered text.
(cherry picked from commit 1ec88cdb82a28851c4b97d7f043d8bcec3c675e8)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I16b09bc4c177df5a74d16653b829b198aa1a800f
Reviewed-on: https://gerrit.libreoffice.org/21996
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/rtfimport/data/tdf96308-tabpos.rtf
b/sw/qa/extras/rtfimport/data/tdf96308-tabpos.rtf
new file mode 100644
index 000..59fdb8f
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf96308-tabpos.rtf
@@ -0,0 +1,12 @@
+{\rtf1
+{\stylesheet
+{\s30\tx2552 Body Text 3;}
+}
+\deftab284
+\pard\plain\par
+\trowd\cellx2694\cellx4678 \pard\intbl\tx284 A1\cell
+\pard\intbl\tx2694 before\par
+\pard\plain\s30\intbl 7.\tab Champion\par
+\pard\plain\intbl after\cell\row
+\pard\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b718572..0544b1e 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2350,6 +2350,22 @@ DECLARE_RTFIMPORT_TEST(testTdf59454, "tdf59454.rtf")
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
+DECLARE_RTFIMPORT_TEST(testTdf96308Tabpos, "tdf96308-tabpos.rtf")
+{
+// Get the tab stops of the second para in the B1 cell of the first table
in the document.
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("B1"),
uno::UNO_QUERY);
+uno::Reference
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+xParaEnum->nextElement();
+uno::Reference xPara(xParaEnum->nextElement(),
uno::UNO_QUERY);
+auto aTabStops = getProperty< uno::Sequence >(xPara,
"ParaTabStops");
+// This failed: tab stops were not deleted as direct formatting on the
paragraph.
+CPPUNIT_ASSERT(!aTabStops.hasElements());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6dd2405..be5a966 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2981,6 +2981,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword
nKeyword)
{
// We are still in a table.
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_inTbl,
std::make_shared(1));
+// Ideally getDefaultSPRM() would take care of this, but it would
not when we're buffering.
+m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_tabs,
std::make_shared());
}
m_aStates.top().resetFrame();
___
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/format.hxx |2 +-
starmath/inc/node.hxx |6 +++---
starmath/source/cfgitem.cxx |4 ++--
starmath/source/dialog.cxx | 24
starmath/source/node.cxx|2 +-
starmath/source/rect.cxx|2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 59aee037e3cf33b253b6f5ebafe3872e420d3408
Author: Takeshi Abe
Date: Mon Feb 1 18:36:48 2016 +0900
starmath: Avoid C-style cast
Change-Id: Ie8ae44e1b90796033847a892474f4de64e7f9328
Reviewed-on: https://gerrit.libreoffice.org/21984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index dccdded..af1b24a 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -26,7 +26,7 @@
#include
-#define SM_FMT_VERSION_51 ((sal_uInt8) 0x01)
+#define SM_FMT_VERSION_51 (sal_uInt8(0x01))
#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
#define FNTNAME_TIMES "Times New Roman"
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 90e7a57..1dc5201 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -165,8 +165,8 @@ public:
sal_Int32 GetAccessibleIndex() const { return mnAccIndex; }
const SmNode * FindNodeWithAccessibleIndex(sal_Int32 nAccIndex) const;
-sal_uInt16 GetRow() const{ return (sal_uInt16)maNodeToken.nRow; }
-sal_uInt16 GetColumn() const { return (sal_uInt16)maNodeToken.nCol; }
+sal_uInt16 GetRow() const{ return
sal::static_int_cast(maNodeToken.nRow); }
+sal_uInt16 GetColumn() const { return
sal::static_int_cast(maNodeToken.nCol); }
SmScaleMode GetScaleMode() const { return meScaleMode; }
voidSetScaleMode(SmScaleMode eMode) { meScaleMode = eMode; }
@@ -559,7 +559,7 @@ protected:
: SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
{
sal_Unicode cChar = GetToken().cMathChar;
-if ((sal_Unicode) '\0' != cChar)
+if (sal_Unicode('\0') != cChar)
SetText(OUString(cChar));
}
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 277f65e..313a33b 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -1220,9 +1220,9 @@ void SmMathConfig::ConfigToItemSet(SfxItemSet &rSet) const
const SfxItemPool *pPool = rSet.GetPool();
rSet.Put(SfxUInt16Item(pPool->GetWhich(SID_PRINTSIZE),
- (sal_uInt16) GetPrintSize()));
+ sal::static_int_cast(GetPrintSize(;
rSet.Put(SfxUInt16Item(pPool->GetWhich(SID_PRINTZOOM),
- (sal_uInt16) GetPrintZoomFactor()));
+ GetPrintZoomFactor()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_PRINTTITLE), IsPrintTitle()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_PRINTTEXT),
IsPrintFormulaText()));
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 5dcbf81..9f02fda 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -218,7 +218,7 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
nPrintSize = PRINT_SIZE_ZOOMED;
rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), nPrintSize));
-rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16)
m_pZoom->GetValue()));
+rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM),
sal::static_int_cast(m_pZoom->GetValue(;
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked()));
rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked()));
@@ -483,11 +483,11 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
{
rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< long
>(m_pBaseSize->GetValue( );
-rFormat.SetRelSize(SIZ_TEXT, (sal_uInt16) m_pTextSize->GetValue());
-rFormat.SetRelSize(SIZ_INDEX,(sal_uInt16) m_pIndexSize->GetValue());
-rFormat.SetRelSize(SIZ_FUNCTION, (sal_uInt16) m_pFunctionSize->GetValue());
-rFormat.SetRelSize(SIZ_OPERATOR, (sal_uInt16) m_pOperatorSize->GetValue());
-rFormat.SetRelSize(SIZ_LIMITS, (sal_uInt16) m_pBorderSize->GetValue());
+rFormat.SetRelSize(SIZ_TEXT,
sal::static_int_cast(m_pTextSize->GetValue()));
+rFormat.SetRelSize(SIZ_INDEX,
sal::static_int_cast(m_pIndexSize->GetValue()));
+rFormat.SetRelSize(SIZ_FUNCTION,
sal::static_int_cast(m_pFunctionSize->GetValue()));
+rFormat.SetRelSize(SIZ_OPERATOR,
sal::static_int_cast(m_pOperatorSize->GetValue()));
+rFormat.SetRelSize(SIZ_LIMITS,
sal::static_int_cast(m_pBorderSize->GetValue()));
const Size aTmp (rFormat.GetBaseSize());
for (sal_uInt16 i = FNT_BEGIN; i <= FNT_END; i++)
@@ -805,10 +805,10 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
if (nActiveCategory != CATEGORY_NONE)
{
pC
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-5' - sc/source
sc/source/core/tool/token.cxx | 102 ++
1 file changed, 93 insertions(+), 9 deletions(-)
New commits:
commit a2b336c89baba81421c7fdc1fef0997b36f4377b
Author: Eike Rathke
Date: Tue Jan 26 16:10:06 2016 +0100
Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta
(cherry picked from commit 02e69f0c3acec2c2e81692bc53c4356591a84ba5)
Conflicts:
sc/source/core/tool/token.cxx
Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27
Reviewed-on: https://gerrit.libreoffice.org/21822
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index d826454..4369017 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3320,17 +3320,33 @@ bool adjustDoubleRefInName(
ScComplexRefData& rRef, const sc::RefUpdateContext& rCxt, const ScAddress&
rPos )
{
bool bRefChanged = false;
-if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs() &&
!rRef.Ref1.IsRowRel() && !rRef.Ref2.IsRowRel())
+if (rCxt.mrDoc.IsExpandRefs())
{
-// Check and see if we should expand the range at the top.
-ScRange aSelectedRange = getSelectedRange(rCxt);
-ScRange aAbs = rRef.toAbs(rPos);
-if (aSelectedRange.Intersects(aAbs))
+if (rCxt.mnRowDelta > 0 && !rRef.Ref1.IsRowRel() &&
!rRef.Ref2.IsRowRel())
{
-// Selection intersects the referenced range. Only expand the
-// bottom position.
-rRef.Ref2.IncRow(rCxt.mnRowDelta);
-return true;
+// Check and see if we should expand the range at the top.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// bottom position.
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+return true;
+}
+}
+if (rCxt.mnColDelta > 0 && !rRef.Ref1.IsColRel() &&
!rRef.Ref2.IsColRel())
+{
+// Check and see if we should expand the range at the left.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// right position.
+rRef.Ref2.IncCol(rCxt.mnColDelta);
+return true;
+}
}
}
@@ -3465,6 +3481,62 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
aRes.mbReferenceModified = true;
}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsEntireRow())
+// Rows of entire rows are not affected.
+break;
+
+if (rRef.Ref1.IsColRel() || rRef.Ref2.IsColRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Row() < rCxt.maRange.aStart.Row()
|| rCxt.maRange.aEnd.Row() < aAbs.aEnd.Row())
+// row range of the reference is not entirely
in the deleted row range.
+break;
+
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncCol(rCxt.mnColDelta);
+
aDeleted.aEnd.SetCol(aDeleted.aStart.Col()-rCxt.mnColDelta-1);
+
+if (aAbs.aEnd.Col() < aDeleted.aStart.Col() ||
aDeleted.aEnd.Col() < aAbs.aStart.Col())
+// reference range doesn't intersect with the
deleted range.
+break;
+
+if (aDeleted.aStart.Col() <= aAbs.aStart.Col() &&
aAbs.aEnd.Col() <= aDeleted.aEnd.Col())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetColDeleted(true);
+rRef.Ref2.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Col() < aDeleted.aStart.Col())
+{
+if (aDeleted.aEnd.Col() < a
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - sc/source
sc/source/core/tool/token.cxx | 106 ++
1 file changed, 97 insertions(+), 9 deletions(-)
New commits:
commit 0c128d84fa2a59b5e76ad844e2feeedd281fdbc2
Author: Eike Rathke
Date: Tue Jan 26 16:10:06 2016 +0100
Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta
Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27
(cherry picked from commit 02e69f0c3acec2c2e81692bc53c4356591a84ba5)
Reviewed-on: https://gerrit.libreoffice.org/21813
Reviewed-by: Markus Mohrhard
Reviewed-by: Miklos Vajna
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 05221e7..5c71a56 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3396,17 +3396,33 @@ bool adjustDoubleRefInName(
ScComplexRefData& rRef, const sc::RefUpdateContext& rCxt, const ScAddress&
rPos )
{
bool bRefChanged = false;
-if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs() &&
!rRef.Ref1.IsRowRel() && !rRef.Ref2.IsRowRel())
+if (rCxt.mrDoc.IsExpandRefs())
{
-// Check and see if we should expand the range at the top.
-ScRange aSelectedRange = getSelectedRange(rCxt);
-ScRange aAbs = rRef.toAbs(rPos);
-if (aSelectedRange.Intersects(aAbs))
+if (rCxt.mnRowDelta > 0 && !rRef.Ref1.IsRowRel() &&
!rRef.Ref2.IsRowRel())
{
-// Selection intersects the referenced range. Only expand the
-// bottom position.
-rRef.IncEndRowSticky(rCxt.mnRowDelta, rPos);
-return true;
+// Check and see if we should expand the range at the top.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// bottom position.
+rRef.IncEndRowSticky(rCxt.mnRowDelta, rPos);
+return true;
+}
+}
+if (rCxt.mnColDelta > 0 && !rRef.Ref1.IsColRel() &&
!rRef.Ref2.IsColRel())
+{
+// Check and see if we should expand the range at the left.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// right position.
+rRef.IncEndColSticky(rCxt.mnColDelta, rPos);
+return true;
+}
}
}
@@ -3548,6 +3564,66 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
aRes.mbReferenceModified = true;
}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsEntireRow())
+// Rows of entire rows are not affected.
+break;
+
+if (rRef.Ref1.IsColRel() || rRef.Ref2.IsColRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Row() < rCxt.maRange.aStart.Row()
|| rCxt.maRange.aEnd.Row() < aAbs.aEnd.Row())
+// row range of the reference is not entirely
in the deleted row range.
+break;
+
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncCol(rCxt.mnColDelta);
+
aDeleted.aEnd.SetCol(aDeleted.aStart.Col()-rCxt.mnColDelta-1);
+
+if (aAbs.aEnd.Col() < aDeleted.aStart.Col() ||
aDeleted.aEnd.Col() < aAbs.aStart.Col())
+// reference range doesn't intersect with the
deleted range.
+break;
+
+if (aDeleted.aStart.Col() <= aAbs.aStart.Col() &&
aAbs.aEnd.Col() <= aDeleted.aEnd.Col())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetColDeleted(true);
+rRef.Ref2.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Col() < aDeleted.aStart.Col())
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/core/tool/token.cxx | 106 ++
1 file changed, 97 insertions(+), 9 deletions(-)
New commits:
commit 7bf650756eec0213d72515c407e8ea998241
Author: Eike Rathke
Date: Tue Jan 26 16:10:06 2016 +0100
Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDelta
Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27
(cherry picked from commit 02e69f0c3acec2c2e81692bc53c4356591a84ba5)
Reviewed-on: https://gerrit.libreoffice.org/21812
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 05221e7..5c71a56 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3396,17 +3396,33 @@ bool adjustDoubleRefInName(
ScComplexRefData& rRef, const sc::RefUpdateContext& rCxt, const ScAddress&
rPos )
{
bool bRefChanged = false;
-if (rCxt.mnRowDelta > 0 && rCxt.mrDoc.IsExpandRefs() &&
!rRef.Ref1.IsRowRel() && !rRef.Ref2.IsRowRel())
+if (rCxt.mrDoc.IsExpandRefs())
{
-// Check and see if we should expand the range at the top.
-ScRange aSelectedRange = getSelectedRange(rCxt);
-ScRange aAbs = rRef.toAbs(rPos);
-if (aSelectedRange.Intersects(aAbs))
+if (rCxt.mnRowDelta > 0 && !rRef.Ref1.IsRowRel() &&
!rRef.Ref2.IsRowRel())
{
-// Selection intersects the referenced range. Only expand the
-// bottom position.
-rRef.IncEndRowSticky(rCxt.mnRowDelta, rPos);
-return true;
+// Check and see if we should expand the range at the top.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// bottom position.
+rRef.IncEndRowSticky(rCxt.mnRowDelta, rPos);
+return true;
+}
+}
+if (rCxt.mnColDelta > 0 && !rRef.Ref1.IsColRel() &&
!rRef.Ref2.IsColRel())
+{
+// Check and see if we should expand the range at the left.
+ScRange aSelectedRange = getSelectedRange(rCxt);
+ScRange aAbs = rRef.toAbs(rPos);
+if (aSelectedRange.Intersects(aAbs))
+{
+// Selection intersects the referenced range. Only expand the
+// right position.
+rRef.IncEndColSticky(rCxt.mnColDelta, rPos);
+return true;
+}
}
}
@@ -3548,6 +3564,66 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
aRes.mbReferenceModified = true;
}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsEntireRow())
+// Rows of entire rows are not affected.
+break;
+
+if (rRef.Ref1.IsColRel() || rRef.Ref2.IsColRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Row() < rCxt.maRange.aStart.Row()
|| rCxt.maRange.aEnd.Row() < aAbs.aEnd.Row())
+// row range of the reference is not entirely
in the deleted row range.
+break;
+
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncCol(rCxt.mnColDelta);
+
aDeleted.aEnd.SetCol(aDeleted.aStart.Col()-rCxt.mnColDelta-1);
+
+if (aAbs.aEnd.Col() < aDeleted.aStart.Col() ||
aDeleted.aEnd.Col() < aAbs.aStart.Col())
+// reference range doesn't intersect with the
deleted range.
+break;
+
+if (aDeleted.aStart.Col() <= aAbs.aStart.Col() &&
aAbs.aEnd.Col() <= aDeleted.aEnd.Col())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetColDeleted(true);
+rRef.Ref2.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Col() < aDeleted.aStart.Col())
+{
+if (!aAbs.IsEndColSticky())
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - sw/uiconfig
sw/uiconfig/swriter/toolbar/standardbar.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13eddaedd3bd8af71cdbc6d756d1db976a073e62 Author: Yousuf Philips Date: Wed Jan 27 20:59:46 2016 +0400 Re-enable insert endnote in Writer's standard toolbar Change-Id: Ied1a1d57b465b436009de3e2c0524c52ba81fd08 Reviewed-on: https://gerrit.libreoffice.org/21845 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips (cherry picked from commit cfb272d1379b202e9c90360a08235c3296b8e84a) Reviewed-on: https://gerrit.libreoffice.org/21848 Reviewed-by: Miklos Vajna Reviewed-by: Samuel Mehrbrodt Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index b917956..ddeec64 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -61,7 +61,7 @@ - + ___ 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' - svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgnode.hxx |2 +-
svgio/inc/svgio/svgreader/svgtextnode.hxx |2 ++
svgio/source/svgreader/svgtextnode.cxx|5 +
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit f9f51e90196101ba0e545fc2631c7414760fa6b5
Author: Xisco Fauli
Date: Tue Jan 26 01:29:22 2016 +0100
SVGIO: tdf#45771: Fix issue when text size is twice its size...
... when using relative units (em, ex)
This is because for nodes of type textnode, getFontSizeNumber
is called from SvgCharacterNode::createSimpleTextPrimitive
and from SvgNode::getCurrentFontSize(), so avoid the second call.
Change-Id: Ibd418708a572e3c1643164a900fac7e7481afe81
Reviewed-on: https://gerrit.libreoffice.org/21801
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 701324a1e1f7e0c181ff1a50956ced686785ea53)
Reviewed-on: https://gerrit.libreoffice.org/21871
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx
b/svgio/inc/svgio/svgreader/svgnode.hxx
index d951a28..3d0dbf5 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -160,7 +160,7 @@ namespace svgio
virtual double getCurrentFontSizeInherited() const override;
virtual double getCurrentXHeightInherited() const override;
-double getCurrentFontSize() const;
+virtual double getCurrentFontSize() const;
double getCurrentXHeight() const;
/// Id access
diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx
b/svgio/inc/svgio/svgreader/svgtextnode.hxx
index 6d0d5c5..54b960c 100644
--- a/svgio/inc/svgio/svgreader/svgtextnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx
@@ -58,6 +58,8 @@ namespace svgio
virtual void parseAttribute(const OUString& rTokenName, SVGToken
aSVGToken, const OUString& aContent) override;
virtual void
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool
bReferenced) const override;
+virtual double getCurrentFontSize() const override;
+
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return
mpaTransform; }
void setTransform(const basegfx::B2DHomMatrix* pMatrix = nullptr)
{ if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix)
mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); }
diff --git a/svgio/source/svgreader/svgtextnode.cxx
b/svgio/source/svgreader/svgtextnode.cxx
index 5f3e0ce..b39f078 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -260,6 +260,11 @@ namespace svgio
}
}
}
+
+double SvgTextNode::getCurrentFontSize() const
+{
+return getCurrentFontSizeInherited();
+}
} // end of namespace svgreader
} // end of namespace svgio
___
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' - officecfg/registry svx/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 ++- svx/source/sidebar/possize/PosSizePropertyPanel.cxx |2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit c39e78c7680457c1e276569409b6a2c279758496 Author: Rishabh Date: Sun Jan 24 03:58:08 2016 +0530 Make Position and Size sidebar tab visible when a line is selected Regression bug introduced by - https://gerrit.libreoffice.org/#/c/16165/ and removal of obsolete writer code. Change-Id: I8ab2e0c04b5c90fafdb43f34899053df7bd7fb4e Reviewed-on: https://gerrit.libreoffice.org/21739 Reviewed-by: Jochen Nitschke Tested-by: Jenkins Reviewed-by: Katarina Behrens (cherry picked from commit 8fb5502b25f0ca0e97e3eb07b68d89d21ee3d0ec) Reviewed-on: https://gerrit.libreoffice.org/21851 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 92071f8..6982bb0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -451,7 +451,6 @@ DrawImpress,TextObject, hidden ; DrawImpress,OLE,hidden ; WriterVariants, Draw, visible ; -WriterVariants, DrawLine, visible ; @@ -505,6 +504,7 @@ Calc, Chart, visible ; Calc, Draw,hidden; +Calc, DrawLine,visible ; Calc, Form,visible ; Calc, Graphic, hidden; Calc, Media, visible ; @@ -512,6 +512,7 @@ Calc, OLE, visible ; DrawImpress,3DObject,visible ; DrawImpress,Draw,hidden; +DrawImpress,DrawLine,visible ; DrawImpress,Form,visible ; DrawImpress,Graphic, hidden; DrawImpress,Media, visible ; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 89effbb..bc3d30e 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -285,8 +285,10 @@ void PosSizePropertyPanel::HandleContextChange( break; case CombinedEnumContext(Application_Calc, Context_Draw): +case CombinedEnumContext(Application_Calc, Context_DrawLine): case CombinedEnumContext(Application_Calc, Context_Graphic): case CombinedEnumContext(Application_DrawImpress, Context_Draw): +case CombinedEnumContext(Application_DrawImpress, Context_DrawLine): case CombinedEnumContext(Application_DrawImpress, Context_TextObject): case CombinedEnumContext(Application_DrawImpress, Context_Graphic): bShowPosition = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - ucb/source
ucb/source/ucp/webdav-neon/webdavcontent.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit abec158e8b0a5c07380cd2bc7f7c5edbef878bed
Author: Giuseppe Castagno
Date: Fri Jan 29 15:39:17 2016 +0100
Related tdf#95217: Force HEAD method in Web access if PROPFIND failed
Change-Id: I9ad798aa8e0909b162f3e1e33c0bc19d4fc7f484
Reviewed-on: https://gerrit.libreoffice.org/21907
Tested-by: Jenkins
Reviewed-by: jan iversen
(cherry picked from commit d61352f58a7f750d3b0b0a9c2d6498fbb7a6e10d)
Reviewed-on: https://gerrit.libreoffice.org/21988
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 85ef1ed..5359c37 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1385,6 +1385,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( bNetworkAccessAllowed )
{
+if( eType != DAV )
+m_bDidGetOrHead = false;
+
// All properties obtained already?
std::vector< OUString > aMissingProps;
if ( !( xProps.get()
___
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' - ucb/source
ucb/source/ucp/webdav-neon/ContentProperties.cxx |6 +++---
ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx |6 +-
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 3d03b2f51912e7ca49251befca3fa61021dc6154
Author: Giuseppe Castagno
Date: Fri Jan 29 16:11:26 2016 +0100
Related tdf#95217: Http header names are case insensitive
Change-Id: I0d81e110a31f93f5f24a96f96c12f0ec9c95921b
Reviewed-on: https://gerrit.libreoffice.org/21906
Tested-by: Jenkins
Reviewed-by: jan iversen
(cherry picked from commit e973b342826e54f147251b132c3325d30749e312)
Reviewed-on: https://gerrit.libreoffice.org/21987
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
index 9c39daa..f7f9730 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
@@ -433,7 +433,7 @@ void ContentProperties::addProperty( const OUString & rName,
(*m_xProps)[ OUString("Size") ]
= PropertyValue( uno::makeAny( aValue.toInt64() ), true );
}
-else if ( rName == "Content-Length" )
+else if ( rName.equalsIgnoreAsciiCase( "Content-Length" ) )
{
// Do NOT map Content-length entity header to DAV:getcontentlength!
// Only DAV resources have this property.
@@ -451,7 +451,7 @@ void ContentProperties::addProperty( const OUString & rName,
(*m_xProps)[ OUString("MediaType") ]
= PropertyValue( rValue, true );
}
-else if ( rName == "Content-Type" )
+else if ( rName.equalsIgnoreAsciiCase( "Content-Type" ) )
{
// Do NOT map Content-Type entity header to DAV:getcontenttype!
// Only DAV resources have this property.
@@ -474,7 +474,7 @@ void ContentProperties::addProperty( const OUString & rName,
(*m_xProps)[ OUString("DateModified") ]
= PropertyValue( uno::makeAny( aDate ), true );
}
-else if ( rName == "Last-Modified" )
+else if ( rName.equalsIgnoreAsciiCase( "Last-Modified" ) )
{
// Do not map Last-Modified entity header to DAV:getlastmodified!
// Only DAV resources have this property.
diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
index cdf3be9..0d39908 100644
--- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
@@ -81,8 +81,12 @@ void process_headers( ne_request * req,
while ( it != end )
{
-if ( (*it) == aHeaderName )
+// header names are case insensitive
+if ( (*it).equalsIgnoreAsciiCase( aHeaderName ) )
+{
+aHeaderName = (*it);
break;
+}
++it;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
