[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/libreoffice/tl.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 097926de45ac5240b96045664fa3ee32d5612c48 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 10 09:10:32 2014 +0100 Adapt FractionPrinter Change-Id: Ic297f14ea1bf5f3fa69c80a34439b5d13fc84346 diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py index 8fb337d..cc02b09 100644 --- a/solenv/gdb/libreoffice/tl.py +++ b/solenv/gdb/libreoffice/tl.py @@ -63,9 +63,9 @@ class FractionPrinter(object): self.val = val def to_string(self): -numerator = self.val['nNumerator'] -denominator = self.val['nDenominator'] -if denominator 0: +numerator = self.val['value']['num'] +denominator = self.val['value']['den'] +if self.val['valid']: return %d/%d % (numerator, denominator) else: return invalid %s %d/%d % (self.typename, numerator, denominator) ___ 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/schema/org/openoffice/Office/Calc.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4301696e6dba0b4e9bc5aa8c98c05e42529bd80c Author: Jan Holesovsky ke...@collabora.com Date: Mon Nov 10 09:20:56 2014 +0100 fdo#85584: Don't update references on sort by default. The default to false seems to fit more use cases than the default to true. Change-Id: I72957ae97892702ba97bd7183ac88457e44b37e4 diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index d3c20cf..597b87f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -686,7 +686,7 @@ descSpecifies whether references get updated when performing sort on a range of cells./desc labelUpdate references when sorting range of cells/label /info -valuetrue/value +valuefalse/value /prop prop oor:name=HighlightSelection oor:type=xs:boolean oor:nillable=false !-- OldPath: Calc/Input -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/outdevgrind.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f9cf4409ae72cef4a34f57d43d7bc174dbbb1bdd
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 10 09:36:13 2014 +0100
loplugin:saloverride
Change-Id: Id7de67480c6f8a31c7b7d6e560e6724fd09d8957
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index f857afe..cbcd1c5 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -57,8 +57,8 @@ namespace
class GrindApp : public Application
{
public:
-virtual int Main();
-virtual sal_uInt16 Exception( sal_uInt16 nError );
+virtual int Main() SAL_OVERRIDE;
+virtual sal_uInt16 Exception( sal_uInt16 nError ) SAL_OVERRIDE;
};
class TestWindow : public Dialog
@@ -73,7 +73,7 @@ class TestWindow : public Dialog
}
virtual ~TestWindow() {}
-virtual void Paint( const Rectangle rRect );
+virtual void Paint( const Rectangle rRect ) SAL_OVERRIDE;
};
typedef boost::function1void, OutputDevice* functor_type;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/icontest.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit f4d4b253242f37efa302ebcddcb75270a119a5b3 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 10 09:37:10 2014 +0100 loplugin:unreffun Change-Id: I230479415a4a822dda22e1795af56572a93cb802 diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 39c3686..74b4df8 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -148,7 +148,6 @@ private: int nRet; void DoItWithVcl(const OUString sImageFile); -void DoItWithOpenGL(const OUString sImageFile); }; void IconTestApp::Init() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/gdi/gdiimpl.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 25542ace16cbed9b8771008fbf3b41a1f28dd425 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 10 09:38:39 2014 +0100 -Werror,-Wheader-guard Change-Id: I692d2011902f46d2ca48b4d1d0a2516026e5cae3 diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 252fe35..91592eb 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCULDED_VCL_GENERIC_GDI_GDIIMPL_HXX +#ifndef INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX #define INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX #include prex.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/gdi/salgdi3.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 2c91a06253fcd02f9cf5196ff994f83a54d3d0ab
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 10 09:39:46 2014 +0100
loplugin:unreffun
Change-Id: Ia35c1b529d51882b48779d8e13afbe17ae66e937
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 3f47712..1809923 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -90,8 +90,6 @@ X11SalGraphics::GetFontGC()
return pFontGC_;
}
-ImplFontOptions* GetFCFontOptions( const ImplFontAttributes rFontAttributes,
int nSize);
-
void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout rLayout )
{
mpTextRenderImpl-DrawServerFontLayout(rLayout);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/gdi/gdiimpl.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a49095dfcde9f1a3d1c04b4cdc3a50f5fc261f3d Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 10 09:41:24 2014 +0100 loplugin:staticcall Change-Id: I33927305351b6e84721c11e3a1814266b41db8da diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 172ebd6..efe66d8 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -178,7 +178,7 @@ X11Pixmap* X11SalGraphicsImpl::GetPixmapFromScreen( const Rectangle rRect ) } // Copy the background of the screen into a composite pixmap -mrParent.CopyScreenArea( mrParent.GetXDisplay(), +X11SalGraphics::CopyScreenArea( mrParent.GetXDisplay(), mrParent.GetDrawable(), mrParent.GetScreenNumber(), mrParent.GetVisual().GetDepth(), pPixmap-GetDrawable(), pPixmap-GetScreen(), @@ -206,7 +206,7 @@ bool X11SalGraphicsImpl::RenderPixmapToScreen( X11Pixmap* pPixmap, int nX, int n if( !pPixmap ) return false; -mrParent.CopyScreenArea( mrParent.GetXDisplay(), +X11SalGraphics::CopyScreenArea( mrParent.GetXDisplay(), pPixmap-GetDrawable(), pPixmap-GetScreen(), pPixmap-GetDepth(), mrParent.GetDrawable(), mrParent.m_nXScreen, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 85584, which changed state. Bug 85584 Summary: Sorting: option UpdateReferenceOnSort should be set to false by default https://bugs.freedesktop.org/show_bug.cgi?id=85584 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde/salnativewidgets-kde.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 62ddb5bb8c87b69a578c838ac33325ab8e7007d5
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Nov 10 10:08:17 2014 +0100
quick build fix until I can fix that properly
Change-Id: I174553768fa12d7b05367498e3755b8e94dfeb47
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index 47320b9..4c48b88 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1383,7 +1383,8 @@ bool KDESalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart,
Display *dpy = GetXDisplay();
::Window drawable = GetDrawable();
-GC gc = SelectPen(); //SelectFont(); // GC with current clipping region set
+// TODO: moggi: FIX that properly!! It was SelectPen()
+GC gc = GetFontGC(); //SelectFont(); // GC with current clipping region set
if ( (nType == CTRL_PUSHBUTTON) (nPart == PART_ENTIRE_CONTROL) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sw/qa
sc/qa/unit/subsequent_export-test.cxx |5 ++---
sw/qa/extras/globalfilter/globalfilter.cxx |9 -
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit e49725438d34df305e7a4730c72034144994306d
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Nov 10 10:24:35 2014 +0100
Fix build.
Change-Id: I91599766e607b26d2c71006c9543a2bd952e228a
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 87a5f21..8aff9e1 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2265,7 +2265,7 @@ void ScExportTest::testFunctionsExcel2010ODS()
void ScExportTest::testSwappedOutImageExport()
{
-const OUString aFilterNames[] = {
+const char* aFilterNames[] = {
calc8,
MS Excel 97,
Calc Office Open XML,
@@ -2282,8 +2282,7 @@ void ScExportTest::testSwappedOutImageExport()
// Check whether the export code swaps in the image which was swapped
out before.
ScDocShellRef xDocSh = loadDoc(document_with_two_images., ODS);
-const OString sFailedMessage = OString(Failed on filter: )
- +
OUStringToOString(aFilterNames[nFilter], RTL_TEXTENCODING_ASCII_US);
+const OString sFailedMessage = OString(Failed on filter: ) +
aFilterNames[nFilter];
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is());
// Export the document and import again for a check
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 9f7d603..a08c916 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -33,7 +33,7 @@ public:
void Test::testSwappedOutImageExport()
{
-const OUString aFilterNames[] = {
+const char* aFilterNames[] = {
writer8,
Rich Text Format,
MS Word 97,
@@ -53,14 +53,11 @@ void Test::testSwappedOutImageExport()
mxComponent-dispose();
mxComponent =
loadFromDesktop(getURLFromSrc(/sw/qa/extras/globalfilter/data/document_with_two_images.odt),
com.sun.star.text.TextDocument);
-const OString sFailedMessage = OString(Failed on filter: )
- +
OUStringToOString(aFilterNames[nFilter], RTL_TEXTENCODING_ASCII_US);
-
// Export the document and import again for a check
uno::Referenceframe::XStorable xStorable(mxComponent,
uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor[FilterName] = aFilterNames[nFilter];
+aMediaDescriptor[FilterName] =
OUString::createFromAscii(aFilterNames[nFilter]);
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
@@ -72,6 +69,8 @@ void Test::testSwappedOutImageExport()
// Check whether graphic exported well after it was swapped out
uno::Referencedrawing::XDrawPageSupplier
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+
+const OString sFailedMessage = OString(Failed on filter: ) +
aFilterNames[nFilter];
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_castsal_Int32(2), xDraws-getCount());
// First image
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/CustomTarget_librelogo.mk solenv/gbuild
librelogo/CustomTarget_librelogo.mk |3 +--
solenv/gbuild/AllLangResTarget.mk |3 +--
solenv/gbuild/Configuration.mk |3 +--
solenv/gbuild/CustomTarget.mk |3 +--
solenv/gbuild/Extension.mk |3 +--
solenv/gbuild/UIConfig.mk |3 +--
6 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 6cad56c32a1464fea3dffd63600c79f8ee00627e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Mon Nov 10 11:15:48 2014 +0100
avoid exceeding commandline limits
by using make's file function via the var2file wrapper instead of
using loong echo statements
Change-Id: Ie81007ad7de8c4e9f4d07724fba3cbe0e93f821d
diff --git a/librelogo/CustomTarget_librelogo.mk
b/librelogo/CustomTarget_librelogo.mk
index 6affb4a..a523d50 100644
--- a/librelogo/CustomTarget_librelogo.mk
+++ b/librelogo/CustomTarget_librelogo.mk
@@ -38,8 +38,7 @@ $(librelogo_DIR)/LibreLogo_%.properties : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
$(call gb_Helper_abbreviate_dirs, \
$(if $(filter-out qtz,$(LANG)), \
- MERGEINPUT=`$(gb_MKTEMP)` \
- echo $(POFILE) $${MERGEINPUT} \
+ MERGEINPUT=$(call var2file,$(shell
$(gb_MKTEMP)),100,$(POFILE)) \
$(call gb_Executable_get_command,propex) \
-i $(SOURCE) \
-o $@ \
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 4289db1..ef10ec5 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -42,8 +42,7 @@ gb_SrsPartMergeTarget_TRANSEXDEPS := $(call
gb_Executable_get_runtime_dependenci
gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call
gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command
-MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(POFILES) $${MERGEINPUT} \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index e5b8a9a..8d3b949 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -211,8 +211,7 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(call
gb_Executable_get_command,cfgex)
define gb_XcuMergeTarget__command
$(call gb_Output_announce,$(2),$(true),XCX,1)
-MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(POFILES) $${MERGEINPUT} \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index e2dc2fd..f68d7da 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -55,8 +55,7 @@ ifneq ($(WITH_LANG),)
# $(call gb_CustomTarget_ulfex__command,ulftarget,ulfsource,pofiles)
define gb_CustomTarget_ulfex__command
$(call gb_Output_announce,$(1),$(true),ULF,1)
-MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(3) $${MERGEINPUT} \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(3)) \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -i $(2) -o $(1) -m
$${MERGEINPUT} -l all) \
rm -rf $${MERGEINPUT}
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index ee3841f..fc6e6b7 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -79,8 +79,7 @@ $(call gb_Extension_get_workdir,%)/description.xml :
else
$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
- MERGEINPUT=`$(gb_MKTEMP)` \
- echo $(POFILES) $${MERGEINPUT} \
+ MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_Extension_get_workdir,$*) \
$(gb_Extension_XRMEXCOMMAND) \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 84f2609..7746a5d 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -28,8 +28,7 @@ $(call gb_UILocalizeTarget_get_workdir,%).ui :
define gb_UILocalizeTarget__command
$(call gb_Output_announce,$(2),$(true),UIX,1)
-MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(POFILES) $${MERGEINPUT} \
+MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) \
$(call gb_Helper_abbreviate_dirs,\
$(gb_UILocalizeTarget_COMMAND) \
-i $(UIConfig_FILE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2608 ++-- 1 file changed, 1354 insertions(+), 1254 deletions(-) New commits: commit 6c7c6e8c93fedbd99d183702eeb89a346fc3da32 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 11:35:19 2014 +0100 update credits Change-Id: I2b5df1e3aeb25637e77710c2d696ce634e71abd9 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 44bd543..59dd6ed 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ ?xml version=1.0 encoding=UTF-8? office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table; xmlns:drawooo=http://openoffice.org/2010/draw; xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0 xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 xmlns:formx=urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0 xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 office:mimetype=application/vnd.oasis.opendocument.text - office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.1.2$Linux_X86_64 LibreOffice_project/958349dc3b25111dbca392fbc281a05559ef6848/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=2 meta:paragraph-count=2968 meta:word-count=10432 meta:character-count=75498 meta:non-whitespace-character-count=66084/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta + office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.3.2$Linux_X86_64 LibreOffice_project/9bb7eadab57b6755b1265afa86e04bf45fbfc644/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=2 meta:paragraph-count=2997 meta:word-count=10534 meta:character-count=76236 meta:non-whitespace-character-count=66733/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta office:settings config:config-item-set config:name=ooo:view-settings - config:config-item config:name=ViewAreaTop config:type=long2406/config:config-item + config:config-item config:name=ViewAreaTop config:type=long1824/config:config-item config:config-item config:name=ViewAreaLeft config:type=long501/config:config-item config:config-item config:name=ViewAreaWidth config:type=long32757/config:config-item config:config-item
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 6297 ++-- 1 file changed, 3865 insertions(+), 2432 deletions(-) New commits: commit e812aaaf31050c29a9499d3936cf07079b1a5f86 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 11:37:14 2014 +0100 update credits Change-Id: I8a181b614ae906890478e0b412f55e0c9000e3c6 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index be85bc7..59dd6ed 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ ?xml version=1.0 encoding=UTF-8? office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table; xmlns:drawooo=http://openoffice.org/2010/draw; xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0 xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 xmlns:formx=urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0 xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 office:mimetype=application/vnd.oasis.opendocument.text - office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.2.2.1$Linux_X86_64 LibreOffice_project/3be8cda0bddd8e430d8cda1ebfd581265cca5a0f/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=1 meta:paragraph-count=2668 meta:word-count=9397 meta:character-count=67860 meta:non-whitespace-character-count=59388/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta + office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.3.2$Linux_X86_64 LibreOffice_project/9bb7eadab57b6755b1265afa86e04bf45fbfc644/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=2 meta:paragraph-count=2997 meta:word-count=10534 meta:character-count=76236 meta:non-whitespace-character-count=66733/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta office:settings config:config-item-set config:name=ooo:view-settings - config:config-item config:name=ViewAreaTop config:type=long63578/config:config-item + config:config-item config:name=ViewAreaTop config:type=long1824/config:config-item config:config-item config:name=ViewAreaLeft config:type=long501/config:config-item - config:config-item config:name=ViewAreaWidth config:type=long32810/config:config-item - config:config-item
[Libreoffice-commits] core.git: 5 commits - bin/findunusedcode chart2/source include/svx sc/source svx/source sw/source unusedcode.easy vcl/source
bin/findunusedcode |2
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx |5 -
chart2/source/controller/inc/dlg_ChartType_UNO.hxx |2
include/svx/svdograf.hxx |1
sc/source/ui/optdlg/calcoptionsdlg.cxx |4 -
sc/source/ui/optdlg/calcoptionsdlg.hxx |1
svx/source/svdraw/svdglue.cxx | 13 ++--
svx/source/svdraw/svdograf.cxx |5 -
sw/source/core/unocore/unoobj.cxx | 13 +++-
sw/source/ui/envelp/envfmt.cxx |4 -
unusedcode.easy|1
vcl/source/fontsubset/sft.cxx | 55 +
12 files changed, 69 insertions(+), 37 deletions(-)
New commits:
commit cfafbcaa3ffcbee4f715fe940c860bedc4db9bb2
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 10 09:20:13 2014 +
callcatcher: unused code
Change-Id: I2ead5d998c3b1b3cde1222fee6f072bf09ab0021
diff --git a/bin/findunusedcode b/bin/findunusedcode
index 5b22056..61ba654 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -25,7 +25,7 @@ echo --without-doxygen
--enable-gtk3
--enable-kde4
--enable-dbus
---enable-gstreamer
+--enable-gstreamer-1-0
--disable-gstreamer-0-10 \
autogen.input
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 9cd0f7c..68c6c18 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -25,11 +25,6 @@
namespace chart
{
using namespace ::com::sun::star;
-uno::Reference uno::XInterface
-SAL_CALL ChartTypeUnoDlg::Create(const uno::Reference
uno::XComponentContext _xContext)
-{
-return *(new ChartTypeUnoDlg(_xContext));
-}
ChartTypeUnoDlg::ChartTypeUnoDlg( const uno::Reference uno::XComponentContext
_xContext )
: ChartTypeUnoDlg_BASE( _xContext )
{
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 98bb3d1..9a00d96 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -39,8 +39,6 @@ public:
// XServiceInfo - static methods
static ::com::sun::star::uno::Sequence OUString
getSupportedServiceNames_Static(void);
static OUString getImplementationName_Static(void) throw(
::com::sun::star::uno::RuntimeException );
-static ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
-SAL_CALL Create(const ::com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext );
private:
virtual ~ChartTypeUnoDlg();
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index d6cb3d2..399bcbd 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -138,7 +138,6 @@ public:
private:
voidForceSwapIn() const;
-voidForceSwapOut() const;
public:
voidSetGraphicLink(const OUString rFileName, const
OUString rReferer, const OUString rFilterName);
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 06e74fa..1510411 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -812,10 +812,6 @@ void ScCalcOptionsDialog::EditFieldValueChanged(Control
*pCtrl)
}
}
-void ScCalcOptionsDialog::WhiteAndBlackListSelectionChanged()
-{
-}
-
OUString
ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv)
const
{
switch (eConv)
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index d8115c2..bc52291 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -53,7 +53,6 @@ private:
void SelectedDeviceChanged();
void SpinButtonValueChanged();
void EditFieldValueChanged(Control *pCtrl);
-void WhiteAndBlackListSelectionChanged();
#if HAVE_FEATURE_OPENCL
void fillOpenCLList();
#endif
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ca34e7e..c2bbeb1 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -588,11 +588,6 @@ void SdrGrafObj::ForceSwapIn() const
}
}
-void SdrGrafObj::ForceSwapOut() const
-{
-pGraphic-FireSwapOutRequest();
-}
-
void SdrGrafObj::ImpLinkAnmeldung()
{
sfx2::LinkManager* pLinkManager = pModel != NULL ?
pModel-GetLinkManager() : NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index 433c410..2eb975d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -166,7 +166,6 @@ apitest::XTextContent::testGetAnchor()
apitest::XTextField::testGetPresentation()
Re: coverity warnings update, 90 remaining warnings, 0.02 density
On Fri, 2014-11-07 at 21:21 +0100, Eike Rathke wrote: Hi Caolán, On Tuesday, 2014-11-04 21:00:27 +, Caolán McNamara wrote: Great, my next contender for most suspicious remaining warning is 1242526 Arguments in wrong order in sc/source/ui/Accessibility/AccessessiblePreviewTable.cxx:322 where rRowInfo.bIsHeader, rCorInfo.bIsHeader arguments are passed to the ScAccessiblePreviewHeaderCell ctor in the same postions as arguments named bIsColHdr and bIsRowHdr Done, dismissed. Similar to other occurrences of this row-column wording mismatch; a row of headers where each cell is a column header, and a column of headers where each cell is a row header. Great. So down to 85 remaining warnings now. A low hanging one that is probably easy to decide if its a problem or not is 735379 copy-paste error sc/source/core/data/dptabres.cxx:2701 nDimSource in this line looks like a copy-paste error, should it be nGroupBase instead ?, and it bases that guess off line 2682 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - dbaccess/source sw/CppunitTest_sw_filters_test.mk sw/qa
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4
sw/CppunitTest_sw_filters_test.mk |1
sw/qa/core/data/602/pass/Sample| 641 +
sw/qa/core/filters-test.cxx|5
4 files changed, 649 insertions(+), 2 deletions(-)
New commits:
commit f86df6e0849cdac74b3254e8d4d847cbd7b75236
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 7 14:25:12 2014 +
602 regression test
Change-Id: I044b9b445a7911e77424613145c7e4d152789f44
diff --git a/sw/CppunitTest_sw_filters_test.mk
b/sw/CppunitTest_sw_filters_test.mk
index c7805b4..94b91c3 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
dbaccess/util/dba \
embeddedobj/util/embobj \
filter/source/config/cache/filterconfig1 \
+filter/source/t602/t602filter \
forms/util/frm \
framework/util/fwk \
i18npool/util/i18npool \
diff --git a/sw/qa/core/data/602/fail/.gitignore
b/sw/qa/core/data/602/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/data/602/indeterminate/.gitignore
b/sw/qa/core/data/602/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/data/602/pass/.gitignore
b/sw/qa/core/data/602/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/data/602/pass/Sample file zak.602
b/sw/qa/core/data/602/pass/Sample file zak.602
new file mode 100644
index 000..aaaed61
--- /dev/null
+++ b/sw/qa/core/data/602/pass/Sample file zak.602
@@ -0,0 +1,641 @@
+ 119
+
+ZKON
+
+ze dne 4. b©ezna 1992
+
+ o cestovn¡ch n hrad ch
+
+ ve znn¡ Opat©en¡ MPSV R ze dne 9.prosince 1992, Opat©en¡ MPSV R
+ ze dne 22.ledna 1993, Opat©en¡ MPSV ze dne 2.b©ezna 1993, Opat©en¡
+ MPSV ze dne 19.b©ezna 1993, Opat©en¡ MPSV ze dne 29.srpna 1993,
+ Opat©en¡ MPSV ze dne 19.listopadu 1993, Opat©en¡ MPSV ze dne 15.
+ prosince 1993,
+
+ a ve znn¡ z kona . 44/1994 Sb.
+
+ Feder ln¡ shrom dn¡ esk a Slovensk Federativn¡ republiky
+ se usneslo na tomto z kon:
+
+
+ S T P R V N
+
+ Z kladn¡ ustanoven¡
+
+ 1
+
+ el z kona
+
+ (1) Tento z kon upravuje poskytov n¡ n hrad vdaj p©i
+ pracovn¡ch cest ch, p©i jinch zmn ch m¡sta vkonu pr ce, p©i
+ p©ijet¡ do zamstn n¡ a p©i p©idlen¡ k vkonu pr ce v zahrani¡
+ (d le jen n hrady)
+ a) pracovn¡km v pracovn¡m pomru,
+ b) lenm drustev, u nich sou st¡ lenstv¡ je t pracovn¡ vztah,
+ c) obanm innm na z klad dohod o prac¡ch konanch mimo pracovn¡
+pomr, je-li to dohodnuto,
+ d) osob m, o nich to stanov¡ tento z kon nebo jin obecn z vazn
+pr vn¡ p©edpis,
+ (d le jen zamstnanec).
+ (2) Tento z kon neupravuje poskytov n¡ n hrad lenm pos dek
+ n mo©n¡ch lod¡ po dobu nalodn¡ {1}.
+
+
+
+ 2
+
+ Vymezen¡ pojm
+
+ (1) Pracovn¡ cestou se pro £ely tohoto z kona rozum¡ doba od
+ n stupu zamstnance na cestu k vkonu pr ce do jinho m¡sta, ne je
+ jeho pravideln pracovi¨t, vetn vkonu pr ce v tomto m¡st, do
+ n vratu zamstnance z tto cesty.
+ (2) Zahranin¡ pracovn¡ cestou se pro £ely tohoto z kona
+ rozum¡ doba pracovn¡ cesty (odstavec 1) z esk a Slovensk
+ Federativn¡ Republiky do zahrani¡, ze zahrani¡ do esk
+ a Slovensk Federativn¡ Republiky a doba pracovn¡ cesty
+ v zahrani¡.
+ (3) Pravidelnm pracovi¨tm se pro £ely tohoto z kona rozum¡
+ m¡sto dohodnut se zamstnancem; nen¡-li takov m¡sto dohodnuto, je
+ pravidelnm pracovi¨tm m¡sto vkonu pr ce sjednan v pracovn¡
+ smlouv. U zamstnanc, u nich ast zmna pracovi¨t vyplv ze
+ zvl ¨tn¡ povahy povol n¡, je mono jako pravideln pracovi¨t
+ dohodnout i m¡sto bydli¨t.
+ (4) Za rodinu zamstnance se pro £ely tohoto z kona
+ povauj¡, pokud maj¡ trval pobyt na £zem¡ esk a Slovensk
+ Federativn¡ Republiky, jeho manel nebo druh, vlastn¡ dti,
+ osvojenci, dti sv©en zamstnanci do pstounsk pe nebo do
+ vchovy, vlastn¡ rodie, osvojitel, opatrovn¡ci, pstouni,
+ pop©¡pad dal¨¡ osoby, ij¡c¡ v dom cnosti {2} se zamstnancem.
+
+
+
+ S T D R U H
+
+ Poskytov n¡ n hrad
+
+ N hrady p©i pracovn¡ cest
+
+
[Libreoffice-commits] core.git: sc/inc sc/qa
sc/inc/inputopt.hxx |3 ++-
sc/inc/scmod.hxx|4 ++--
sc/qa/unit/filters-test.cxx | 21 +
3 files changed, 25 insertions(+), 3 deletions(-)
New commits:
commit 447d523fa7c6c82476f9ee48e4b9c82cfad05c50
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Nov 10 12:17:35 2014 +0100
fdo#85584: Adapt the unit test to the new default.
Change-Id: I7c4935040ba16378023695c74bf2a5cd75fe8a77
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 37bfbc4..b6d2a09 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -20,9 +20,10 @@
#ifndef INCLUDED_SC_INC_INPUTOPT_HXX
#define INCLUDED_SC_INC_INPUTOPT_HXX
+#include scdllapi.h
#include unotools/configitem.hxx
-class ScInputOptions
+class SC_DLLPUBLIC ScInputOptions
{
private:
sal_uInt16 nMoveDir; // enum ScDirection
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 136f08f..59b1ab0 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -174,14 +174,14 @@ SC_DLLPUBLICconst ScDocOptions GetDocOptions
();
SC_DLLPUBLICconst ScAppOptions GetAppOptions ();
SC_DLLPUBLICconst ScDefaultsOptions GetDefaultsOptions ();
SC_DLLPUBLIC const ScFormulaOptions GetFormulaOptions ();
-const ScInputOptions GetInputOptions ();
+SC_DLLPUBLIC const ScInputOptions GetInputOptions ();
SC_DLLPUBLICconst ScPrintOptions GetPrintOptions ();
voidSetViewOptions ( const ScViewOptions rOpt );
SC_DLLPUBLICvoidSetDocOptions ( const ScDocOptions
rOpt );
SC_DLLPUBLICvoidSetAppOptions ( const ScAppOptions
rOpt );
voidSetDefaultsOptions ( const ScDefaultsOptions rOpt
);
SC_DLLPUBLIC voidSetFormulaOptions ( const
ScFormulaOptions rOpt );
-voidSetInputOptions ( const ScInputOptions rOpt );
+SC_DLLPUBLIC void SetInputOptions ( const ScInputOptions rOpt );
voidSetPrintOptions ( const ScPrintOptions rOpt );
voidInsertEntryToLRUList(sal_uInt16 nFIndex);
voidRecentFunctionsChanged();
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 2080207..f8a911f 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -23,6 +23,7 @@
#include helper/qahelper.hxx
#include docsh.hxx
+#include inputopt.hxx
#include postit.hxx
#include patattr.hxx
#include scitems.hxx
@@ -103,6 +104,7 @@ public:
private:
uno::Referenceuno::XInterface m_xCalcComponent;
+bool mbUpdateReferenceOnSort; /// Remember the configuration option so
that we can set it back.
};
bool ScFiltersTest::load(const OUString rFilter, const OUString rURL,
@@ -611,6 +613,12 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
// Document contains cached external references.
void ScFiltersTest::testSortWithSheetExternalReferencesODS()
{
+// this test only works with UpdateReferenceOnSort == true, set it now.
+// we reset the value back to the original in tearDown()
+ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
+aInputOption.SetSortRefUpdate(true);
+SC_MOD()-SetInputOptions(aInputOption);
+
ScDocShellRef xDocSh = loadDoc(sort-with-sheet-external-references.,
ODS, true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument rDoc = xDocSh-GetDocument();
@@ -698,12 +706,25 @@ void ScFiltersTest::setUp()
m_xCalcComponent =
getMultiServiceFactory()-createInstance(com.sun.star.comp.Calc.SpreadsheetDocument);
CPPUNIT_ASSERT_MESSAGE(no calc component!, m_xCalcComponent.is());
+
+// one test sets this configuration option; make sure we remember the
+// original value
+ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
+mbUpdateReferenceOnSort = aInputOption.GetSortRefUpdate();
}
void ScFiltersTest::tearDown()
{
uno::Reference lang::XComponent ( m_xCalcComponent, UNO_QUERY_THROW
)-dispose();
test::BootstrapFixture::tearDown();
+
+// one test sets this configuration option; make sure we return it back
+ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
+if (mbUpdateReferenceOnSort != aInputOption.GetSortRefUpdate())
+{
+aInputOption.SetSortRefUpdate(mbUpdateReferenceOnSort);
+SC_MOD()-SetInputOptions(aInputOption);
+}
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScFiltersTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild
configure.ac |4 solenv/gbuild/platform/com_GCC_defs.mk |4 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 71a9c492b8ac7d9f33a92327d43efcb0e4617243 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Mon Nov 10 12:29:10 2014 +0100 force --std=gnu89 for clang (and gcc), properly This implements 3a4860a751980b566b44d57cde188292df5e8726 in the proper place. Change-Id: I7b60602933819561d0bff5e72dcd5ee8986f63c0 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 1b2ceeb..b6d9735 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -107,6 +107,10 @@ gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \ -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations endif +# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to +# to catch potential gnu89/C90 incompatibilities locally. +gb_CFLAGS_COMMON += -std=gnu89 + ifeq ($(ENABLE_LTO),TRUE) ifeq ($(COM_GCC_IS_CLANG),TRUE) gb_LTOFLAGS := -flto commit 74a2fb369c9ca7b3b423723926626fb0760abb29 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Mon Nov 10 12:22:01 2014 +0100 Revert Force --std=gnu89 for clang. Explictly passing any CFLAGS to configure overrides (=disables) CFLAGS that would be used by default. So if this sets CFLAGS to just --std=gnu89, .c files will never be built with optimization or debuginfo. This reverts commit 3a4860a751980b566b44d57cde188292df5e8726. diff --git a/configure.ac b/configure.ac index b1fada1..f47b06a 100644 --- a/configure.ac +++ b/configure.ac @@ -3190,10 +3190,6 @@ if test $GCC = yes; then AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER]) AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION) fi - -# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to -# to catch potential gnu89/C90 incompatibilities locally. -CFLAGS=$CFLAGS -std=gnu89 fi AC_SUBST(COM_GCC_IS_CLANG) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source include/drawinglayer include/vcl offapi/com pyuno/demo pyuno/source sal/osl sal/rtl sd/source svx/source toolkit/test wizards/com
canvas/source/directx/dx_9rm.cxx | 2 +- include/drawinglayer/primitive3d/baseprimitive3d.hxx | 2 +- include/vcl/threadex.hxx | 4 ++-- offapi/com/sun/star/ucb/Content.idl| 2 +- pyuno/demo/hello_world_comp.py | 2 +- pyuno/source/module/uno.py | 2 +- sal/osl/unx/process.cxx| 2 +- sal/rtl/alloc_global.cxx | 6 +++--- sd/source/ui/view/viewshel.cxx | 2 +- svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 2 +- toolkit/test/accessibility/AccessibleUNOHandler.java | 2 +- wizards/com/sun/star/wizards/agenda/CallWizard.py | 6 +++--- wizards/com/sun/star/wizards/fax/CallWizard.py | 6 +++--- wizards/com/sun/star/wizards/letter/CallWizard.py | 6 +++--- wizards/com/sun/star/wizards/web/CallWizard.py | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) New commits: commit cd3204559cee4eb0ef2eafdb4d5d7e3abf458cf4 Author: Noel Grandin n...@peralex.com Date: Mon Nov 10 13:30:41 2014 +0200 fix spelling implemenation - implementation Change-Id: I5ac499df1f4063a80a5d41f60778106a7b96940d diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index cc48395..f679bd1 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -131,7 +131,7 @@ namespace dxcanvas // DXSurface -/** ISurface implemenation. +/** ISurface implementation. @attention holds the DXRenderModule via non-refcounted reference! This is safe with current state of affairs, since diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index a40b5c1..69e18b4 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -119,7 +119,7 @@ namespace drawinglayer */ virtual Primitive3DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -/** the getRange default implemenation will use getDecomposition to create the range information from merging +/** the getRange default implementation will use getDecomposition to create the range information from merging getRange results from the single local decomposition primitives. */ virtual ::com::sun::star::geometry::RealRectangle3D SAL_CALL getRange( const ::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index b2f24d65..b5122f6 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -168,7 +168,7 @@ private: /** Makes a copy back reference wrapper to be used for inout parameters. Only use for syncExecute(), the returned wrapper relies on its -implemenation, i.e. the function object is stored in free store. +implementation, i.e. the function object is stored in free store. Type T needs to be copy constructable assignable. @see syncExecute() @@ -183,7 +183,7 @@ inline detail::copy_back_wrapperT inout_by_ref( T r ) /** Makes a copy back ptr wrapper to be used for inout parameters. Only use for syncExecute(), the returned wrapper relies on its -implemenation, i.e. the function object is stored in free store. +implementation, i.e. the function object is stored in free store. Type T needs to be copy constructable assignable. @see syncExecute() diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl index a2cedb2..f39d598 100644 --- a/offapi/com/sun/star/ucb/Content.idl +++ b/offapi/com/sun/star/ucb/Content.idl @@ -357,7 +357,7 @@ published service Content tdSearchCommandArgument aSearchCommandArg/td td This command searches for subcontents of a content matching the -given search criteria. The command will return an implemenation +given search criteria. The command will return an implementation of service DynamicResultSet. /td /tr diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ccc00363df2256a63351520595e7a16b04713a33 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:03:54 2014 +0100 Updated core Project: translations 27e2234d459ba1d48cdd3560055f7b4559d0b48f diff --git a/translations b/translations index 68c8a26..27e2234 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 68c8a26642c7e59474b4f1d3e13564a9c1503d05 +Subproject commit 27e2234d459ba1d48cdd3560055f7b4559d0b48f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-3-4'
New branch 'libreoffice-4-3-4' available with the following commits: commit e450483bde302c33833063df36c72b9d9b870f5b Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:44:54 2014 +0100 Branch libreoffice-4-3-4 This is 'libreoffice-4-3-4' - the stable branch for the 4.3.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I01304c52ef48cbdb195ec28223c6cbafeeb81d21 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-3-4'
New branch 'libreoffice-4-3-4' available with the following commits: commit 4d4b58a9e0de53bf3938c4f205e6303bb846cd03 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:44:54 2014 +0100 Branch libreoffice-4-3-4 This is 'libreoffice-4-3-4' - the stable branch for the 4.3.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Idf9cb19c4ddea315f4654572cd2ab7cff583406a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-3-4'
New branch 'libreoffice-4-3-4' available with the following commits: commit d5803c8d93015da901128d3c445637df86086d1f Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:44:53 2014 +0100 Branch libreoffice-4-3-4 This is 'libreoffice-4-3-4' - the stable branch for the 4.3.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I87b48abe8895d72033f83b9a7459451e99d1aebb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 71423, which changed state. Bug 71423 Summary: Impress frequently crashes when editing tables in slides https://bugs.freedesktop.org/show_bug.cgi?id=71423 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-3-4'
New branch 'libreoffice-4-3-4' available with the following commits: commit e011e67d7a3d73bd53225bd28de3313ac48bfae8 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:45:13 2014 +0100 Branch libreoffice-4-3-4 This is 'libreoffice-4-3-4' - the stable branch for the 4.3.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Iea60ec9a117be625464d7f94287bef0ad59cc99a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00d62c5b7d3f4dc6f79cdadd692d36f5f9de849d Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:49:21 2014 +0100 bump product version to 4.3.5.0.0+ Change-Id: Ie4defe5657b24718f597b6dc5d30d054268936d0 diff --git a/configure.ac b/configure.ac index 74211a8..adb9084 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.3.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.3.5.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3e9978b73555cfd61e4e09268388f563b78a4682 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 10 12:53:46 2014 +0100 bump product version to 4.3.4.1.0+ Change-Id: I6a6ec7a363d6621a54ac190374e1bcd07d0cdf8e diff --git a/configure.ac b/configure.ac index 74211a8..cd646bb 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.3.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.3.4.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.3.4.1'
Tag 'libreoffice-4.3.4.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-11-10 11:53 -0800 Tag libreoffice-4.3.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUYKcfAAoJEPQ0oe+v7q6j0ZoQAL9dCLYipYBl/k3x4UHFeDnx D8YpKYM7xjKE95K0IH0k6Z/6cSGSKRl4evzVb45d7yE7+XMq8WD9GUJ3LRD8p7tX xu50QoTu2GEz+qHGQ3dXVz703eTzHlLwg/5j3FaW8ix4q737Mj3x/1FRY7WQSLfX /Fd5pigl4TDSA9ern7oTPF3ObsssJuFNU8HATtu7KmwEu7zAIfVLmUmU/E5yFozo haW1PmNTyC8F6jbntsA9+hrTkrmpZzr8e8marTAJHWr24QYelmrvYfNXk9ukKewL zGi8DwGd1Q1y+22B8516VXqiJOgdX/N5KStbUN3jYGYHqJz8tSc5E0FK/I3ti0Xy y66kfayKafR9WHZnYSynVAS5OSKHUg6zEsicPKLsBmU4dFXdVwXkh9n7GlnQfa2c FUhHHg+0sTaHqNBkikl23KbQ2oqGLygsfOm3AnU1WL0W0s+Gij7pdGy7S/epfetT S473CdS73KErm8wiFqqGskhX6kmv2eA0hCSsJRkdXIYsr0OZXkXyWsNtEl9/ClLj WxRajoFpkpjsPXfcuA4OhINKo1YeXFEK6dDF776pwkNoI6wy4WZVOFSf2PQEYpfN DuhjFnEWTdJXdIcAmTOpJ0Z+sQhT444axC/uryDvu+4v8vkGLT7anQAWcBxAIXEf Eai82UWxmEOnWUPSkUna =RwIj -END PGP SIGNATURE- Changes since lof-4.3-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.3.4.1'
Tag 'libreoffice-4.3.4.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-11-10 11:53 -0800 Tag libreoffice-4.3.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUYKcjAAoJEPQ0oe+v7q6jDxcP/iwjt+S+DmQiEqtqEhxczU2c EOveeW1yTlNNOMjJ+anDdtGpJx4pQFWSSkl6KbY3Q5MIExV4cvaOTKZOd34uxbpu e9P0u9/y8DZM56fjUOC0AyL8bWoWvexlXnFcebd5IZll6RY8g0tZ9cmJkZLolaR+ flxw8I6wp+RtFiogCrSPOMCB/xIBtiHt4APrhCeWFE8xHcqKdnkHEannzsjYQniZ aTejIFlTZe0HFdpShvHgb5/dbix4bKFuYPjxtFKQSjXzcHoNXaGyXEiS2fKXTjBD hdUxwRBWTWKpK28FSglXbOW1/mQIIpsL02dpivh3ltQU0BQ3gbtoujuTG436GRkp TBy9eJfj7RO4F1Bm7YLlceXMZPJ4TkxKPx4aoRrjo9a8WZXOub6Ta/9ECuCkYIuE 8/C5LboH6lqGIs4lAOFV4im6IO/MtAted819Baapy/vo2yizw5nZu4oPzeskaeaB mu841ijRwyiPQhrPLxfMMeYyNF/wqa02daUKIuDl4x3S8vtTpNO8MIli4+uRhOA9 v9AOawNzKzxzjEXFbe0aB0prOEa3jEGA8rkPW3HgGOAKaVJVGIEHWywH9rVFouD3 +gGeVMi4fmy2ZaGHRVFkaOtkrKAupIbgU2mjwAz4qiIEaRT/mPm47q6GoRCi7pcZ w4S+qddC39/dEiKeU6Am =UPZg -END PGP SIGNATURE- Changes since lof-4.3-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.3.4.1'
Tag 'libreoffice-4.3.4.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-11-10 11:53 -0800 Tag libreoffice-4.3.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUYKcqAAoJEPQ0oe+v7q6jrmcQAMLs4DJ+Nns8SuFPB2dGJgu4 Dv3WQ7ySLjsUi9QDfSvDSzGgy8asRn0Y8cyuvo9fVm3eZM5fk19WFUE1Xx0BmY5b w09TkGa+iUDWLpfonOXDmvqdTR/xIaNEhgLIxGYnfvRFoJvoBbQ/n2EBN8vr0RRI Rtw9/D2XYmuNsQfZGSGCTngXucL2AZDN9TmynaMF164NzytYUXU11LSr9SYPBsIi G4Wbu+X/kVbqVVasn3/1QEfiplDwzJmkaIc/B0+9Uq/5LlB9J4WUDHBczivEGRdr rvPMTsqmzdPvuNyWYgadfIMt55wMLAXd7ynrBVQ9nqQKFK+reYw8hcC3ltbpIbeo 3LvuIXVW9OsbCE6zWNiJ1SlVOMEEBO9zluwXQruDQamPtOIT/MyLYyG6q+rmCQ1J htZn75YPYDuSfKjMVJkZ30v99mGTt+oBlJnnCLfjinEhZh1ADP7Rjcv9BCpMhlzF KMirYWKXf8U2DzJXPVOmXB4lfkxBmj2gxTJMkaQmo/ulkqAVmRFqVCMHOaYfdmNo lB7lF/CGYCEI82W/YInGDf7kGVAWd5fWomLfWAP8d8IiMZDXHopqTPwrzlSWyfHm ZaG4ArgejM7Cq6VwuY3f2Ol1gtWv8dkb7XJpiSTBzTOmIMvfNQkICqooZR7zfTXo tzLkJJ+lt5Zqi45607xp =ax4D -END PGP SIGNATURE- Changes since lof-4.3-branch-point-146: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.3.4.1'
Tag 'libreoffice-4.3.4.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-11-10 11:53 -0800 Tag libreoffice-4.3.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJUYKcmAAoJEPQ0oe+v7q6jOqUP/iALN5PtF9kkhnKrYm5Ji//K 0mfEUEQ/Tej7eXLuLAHzWpKqNOGvXb0OBqXv6aZ4Q184hVUvbPgxuCoNyMsDT0IP g3pgiEy/tV9i8kaozcQ3y03YxxBHRdz/VN35EpjJULBy+/LZlyHhvXcQXS4/r0UM h6q6zsq9ym79lMnyChWpqt0g1b2nN2p43NuBTxyttyJer5DWYqZPXudicjgKcaak tzOEJXRig+8ro55BMj41+T3xg1mJwOCdK6RJIgCbr1urS3v+pI337XAmTPvZdzeA p5ox8BDzezGe5zWNl+2oiaL2MP3OqIFnmM09eVu8PJHJIzDrbpyW0lXtRW3vh3Hk b9/o9Pxtdr/C6OsL7/TK5B2o8uvS3rUGwB7mGWDS7tAb9b562LTjhmRhaY2k9zoX 1szA84j7m9Tj5jPwOQrTH/cfoXhtyjn9lwamwRh1atXmOsdeskUksK8HGXla0Dnw UbbSQ+6bFJjXcw0aev1T/zsLRPa6hroPWFkgJ5S/6CwG6fUNEsip15ozPxYIaZky VZFl3C13rqw0KpXbeCwbdxnmEqkiaY/EWPjmz+fbJ2dEl5KxY87+x2bpIb07yLKO uI8e3lyHOo6EIlk3qkEmIgAydzbym8wexsjH5azqpgjQ3XEnR5O98aL8r6uD9IFL qNlKtQDp6RhZ75lYwnTl =O9Di -END PGP SIGNATURE- Changes since lof-4.3-branch-point-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/filters-test.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 7f86fc0b9835be4d2c3e98271b32454f8df427ec
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Nov 10 11:55:27 2014 +
Disable problematic sorting test that depends on the old default.
Change-Id: Ie05ff3f1ba5e42cc2ec54f23f0b6376a81221592
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index f8a911f..80a 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -561,6 +561,10 @@ void ScFiltersTest::testEnhancedProtectionXLSX()
void ScFiltersTest::testSortWithSharedFormulasODS()
{
+// This depends on the old 'new' sorting default, and from this
+// test it is overly hard to change that setting cleanly, so
+// disable for now until we can re-work this test.
+#if 0
ScDocShellRef xDocSh = loadDoc(shared-formula/sort-crash., ODS, true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument rDoc = xDocSh-GetDocument();
@@ -606,6 +610,7 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
CPPUNIT_ASSERT_EQUAL(static_castSCROW(15), pFC-GetSharedLength());
xDocSh-DoClose();
+#endif
}
// https://bugs.freedesktop.org/attachment.cgi?id=100089 from fdo#77018
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/odfimport/odfimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72e901c1d03ddf523472d33b77d60d5be531a2a6 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Fri Nov 7 15:12:42 2014 +0100 sw: disable failing cp test on headless build Change-Id: If9c3aad600332ae289e05e3b046f8b15292dee57 Reviewed-on: https://gerrit.libreoffice.org/12301 Reviewed-by: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Tested-by: Riccardo Magliocchetti riccardo.magliocche...@gmail.com diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index fb4cf65..2b24dc5 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -450,7 +450,7 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, fdo37606.odt) // Previously copypaste failed to copy the table in case it was the document-starting one. uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Referencecontainer::XIndexAccess xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY); -#ifndef MACOSX // FIXME +#if !defined(MACOSX) !defined(ENABLE_HEADLESS) // FIXME CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount()); #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 3 commits - android/Bootstrap desktop/source
android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java | 53
--
android/Bootstrap/src/org/libreoffice/kit/Office.java|1
desktop/source/lib/lokandroid.cxx| 22
+++-
3 files changed, 64 insertions(+), 12 deletions(-)
New commits:
commit 0da99921b9ee33f9f6e8c41cba42cbdd9197bc77
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Nov 10 13:10:03 2014 +0100
android: add destroy and exit as a separate JNI call
Change-Id: Ia8516da556b3736f34b366e2eb89ad8bbd7bafc1
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Office.java
b/android/Bootstrap/src/org/libreoffice/kit/Office.java
index d603066..bd6144f 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Office.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Office.java
@@ -31,4 +31,5 @@ public class Office {
}
public native void destroy();
+public native void destroyAndExit();
}
diff --git a/desktop/source/lib/lokandroid.cxx
b/desktop/source/lib/lokandroid.cxx
index a6f02d6..707996e 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -69,6 +69,12 @@ extern C SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_kit_Office_destroy(J
{
LibreOfficeKit* pLibreOfficeKit = getHandleLibreOfficeKit(pEnv, aObject);
pLibreOfficeKit-pClass-destroy(pLibreOfficeKit);
+}
+
+extern C SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_kit_Office_destroyAndExit(JNIEnv* pEnv, jobject aObject)
+{
+LibreOfficeKit* pLibreOfficeKit = getHandleLibreOfficeKit(pEnv, aObject);
+pLibreOfficeKit-pClass-destroy(pLibreOfficeKit);
// Stopgap fix: _exit() to force the OS to restart the LO activity.
// Better than to hang.
_exit(0);
commit 7a454f86459c86dd6d2608f3b53bb85272d45747
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Nov 10 13:04:27 2014 +0100
android: VM based implementation of DirectBufferAllocator
DirectBufferAllocator is responsible to allocate buffer. We used
Fennec JNI based allocation (and freeing) because of overallocation
bug in some Android versions. With this the VM based allocator
implementation is added and used by default because of bugs that
happen in newer Android versions (specifically when ART is used
as the Android VM).
Change-Id: I07eb364fd1647b3a09d1568d4fef82398a02dfeb
diff --git
a/android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java
b/android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java
index 7c8f808..431ccad 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java
@@ -11,10 +11,14 @@ package org.libreoffice.kit;
// https://code.google.com/p/android/issues/detail?id=16941
//
+import android.util.Log;
+
import java.nio.ByteBuffer;
public class DirectBufferAllocator {
+private static final String LOGTAG =
DirectBufferAllocator.class.getSimpleName();
+
private DirectBufferAllocator() {
}
@@ -23,13 +27,23 @@ public class DirectBufferAllocator {
private static native void freeDirectBufferNative(ByteBuffer aBuffer);
public static ByteBuffer allocate(int size) {
-if (size = 0) {
-throw new IllegalArgumentException(Invalid size + size);
-}
+Log.i(LOGTAG, Buffer size: + size);
+return allocateVM(size);
+}
+
+public static ByteBuffer free(ByteBuffer buffer) {
+return freeVM(buffer);
+}
+private static ByteBuffer allocateJNI(int size) {
ByteBuffer directBuffer = allocateDirectBufferNative(size);
+
if (directBuffer == null) {
-throw new OutOfMemoryError(allocateDirectBuffer() returned null);
+if (size = 0) {
+throw new IllegalArgumentException(Invalid allocation size:
+ size);
+} else {
+throw new OutOfMemoryError(allocateDirectBuffer() returned
null);
+}
} else if (!directBuffer.isDirect()) {
throw new AssertionError(allocateDirectBuffer() did not return a
direct buffer);
}
@@ -37,7 +51,7 @@ public class DirectBufferAllocator {
return directBuffer;
}
-public static ByteBuffer free(ByteBuffer buffer) {
+private static ByteBuffer freeJNI(ByteBuffer buffer) {
if (buffer == null) {
return null;
}
@@ -49,4 +63,31 @@ public class DirectBufferAllocator {
freeDirectBufferNative(buffer);
return null;
}
-}
\ No newline at end of file
+
+private static ByteBuffer allocateVM(int size) {
+ByteBuffer directBuffer = ByteBuffer.allocateDirect(size);
+if (directBuffer == null) {
+if (size = 0) {
+throw new IllegalArgumentException(Invalid allocation size:
+ size);
+} else {
+throw new
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 71423, which changed state. Bug 71423 Summary: Impress frequently crashes when selecting or editing tables in slides while styles formatting dialog is open https://bugs.freedesktop.org/show_bug.cgi?id=71423 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/opengl vcl/source vcl/workben
include/vcl/bitmapex.hxx|2 +
vcl/opengl/gdiimpl.cxx |2 -
vcl/source/gdi/bitmapex.cxx | 17 +++-
vcl/workben/vcldemo.cxx | 84 ++--
4 files changed, 75 insertions(+), 30 deletions(-)
New commits:
commit 16068663e2aa984388be5f774b8f1917c12bf6f3
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Nov 10 12:16:15 2014 +
vcldemo: load and render some icons
Change-Id: I4a4567d43e4c5c8a7ce7ba2764d2f9668fed291f
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index daa877f..1142e37 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -25,10 +25,9 @@
#include vcl/virdev.hxx
#include vcl/graphicfilter.hxx
-# define FIXME_ALPHA_WORKING
-# define FIXME_ROUNDED_RECT_WORKING
-# define FIXME_DRAW_TRANSPARENT_WORKING
#if 0
+# define FIXME_SELF_INTERSECTING_WORKING
+# define FIXME_DRAW_BITMAPEX
#endif
using namespace css;
@@ -99,7 +98,6 @@ public:
rDev.SetLineColor(Color(COL_BLACK));
rDev.DrawRect( r );
-// FIXME: notice these appear reflected at the bottom not the top.
for(int i=0; ir.GetHeight(); i+=15)
rDev.DrawLine( Point(r.Left(), r.Top()+i), Point(r.Right(),
r.Bottom()-i) );
for(int i=0; ir.GetWidth(); i+=15)
@@ -126,8 +124,7 @@ public:
rDev.DrawText( r, OUString( Just a simple text ) );
}
-void drawPoly(OutputDevice rDev, Rectangle r)
- // pretty
+void drawPoly(OutputDevice rDev, Rectangle r) // pretty
{
drawCheckered(rDev, r);
@@ -181,14 +178,10 @@ public:
BitmapEx aBitmap(maIntro);
aBitmap.Scale(r.GetSize(), BMP_SCALE_BESTQUALITY);
-#ifdef FIXME_ALPHA_WORKING
AlphaMask aSemiTransp(aBitmap.GetSizePixel());
aSemiTransp.Erase(64);
rDev.DrawBitmapEx(r.TopLeft(), BitmapEx(aBitmap.GetBitmap(),
- aSemiTransp));
-#else
-rDev.DrawBitmapEx(r.TopLeft(), aBitmap);
-#endif
+aSemiTransp));
}
void drawPolyPolgons(OutputDevice rDev, Rectangle r)
@@ -196,8 +189,13 @@ public:
struct {
double nX, nY;
} aPoints[] = { { 0.1, 0.1 }, { 0.9, 0.9 },
+#ifdef FIXME_SELF_INTERSECTING_WORKING
{ 0.9, 0.1 }, { 0.1, 0.9 },
{ 0.1, 0.1 } };
+#else
+{ 0.1, 0.9 }, { 0.5, 0.5 },
+{ 0.9, 0.1 }, { 0.1, 0.1 } };
+#endif
tools::PolyPolygon aPolyPoly;
// Render 4x polygons aggregate into another PolyPolygon
@@ -228,16 +226,12 @@ public:
}
rDev.SetLineColor(Color(COL_LIGHTRED));
rDev.SetFillColor(Color(COL_GREEN));
-#ifdef FIXME_DRAW_TRANSPARENT_WORKING
rDev.DrawTransparent(aPolyPoly, 50);
-#else
-rDev.DrawPolyPolygon(aPolyPoly);
-#endif
}
void drawToVirtualDevice(OutputDevice rDev, Rectangle r)
{
-VirtualDevice aNested;
-aNested.SetOutputSize(r.GetSize());
+VirtualDevice aNested(rDev);
+aNested.SetOutputSizePixel(r.GetSize());
Rectangle aWhole(Point(0,0), r.GetSize());
// mini me
drawToDevice(aNested, true);
@@ -246,9 +240,52 @@ public:
rDev.DrawBitmap(r.TopLeft(), aBitmap);
}
+std::vectorBitmapEx maIcons;
+void initIcons()
+{
+if (maIcons.size())
+return;
+
+const char *pNames[] = {
+cmd/lc_openurl.png,
+cmd/lc_newdoc.png,
+cmd/lc_save.png,
+cmd/lc_saveas.png,
+cmd/lc_sendmail.png,
+cmd/lc_editdoc.png,
+cmd/lc_print.png,
+cmd/lc_printpreview.png,
+cmd/lc_cut.png,
+cmd/lc_copy.png,
+cmd/lc_paste.png,
+cmd/lc_formatpaintbrush.png,
+cmd/lc_undo.png,
+cmd/lc_redo.png,
+};
+for (size_t i = 0; i SAL_N_ELEMENTS(pNames); i++)
+maIcons.push_back(BitmapEx(OUString::createFromAscii(pNames[i])));
+}
+void drawIcons(OutputDevice rDev, Rectangle r)
+{
+initIcons();
+
+Rectangle p(r);
+for (size_t i = 0; i maIcons.size(); i++)
+{
+Size aSize(maIcons[i].GetSizePixel());
+#ifdef FIXME_DRAW_BITMAPEX
+rDev.DrawBitmapEx(p.TopLeft(), maIcons[i]);
+#else
+rDev.DrawBitmap(p.TopLeft(), maIcons[i].GetBitmap());
+#endif
+p.Move(aSize.Width(), 0);
+if (p.Left() = r.Right())
+break;
+}
+}
+
void fetchDrawBitmap(OutputDevice rDev, Rectangle r)
{
-// FIXME: should work ...
Bitmap aBitmap(GetBitmap(Point(0,0),rDev.GetOutputSizePixel()));
aBitmap.Scale(r.GetSize(), BMP_SCALE_BESTQUALITY);
rDev.DrawBitmap(r.TopLeft(), aBitmap);
@@ -277,15 +314,9 @@ std::vectorRectangle
[Libreoffice-commits] core.git: Branch 'feature/priorities' - 2 commits - sc/source sd/source
sc/source/ui/inc/navipi.hxx |2
sc/source/ui/navipi/navipi.cxx| 121 --
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 19 -
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx |2
4 files changed, 68 insertions(+), 76 deletions(-)
New commits:
commit 675e8e2727794dcddc92e13865ccfa9403e81922
Author: Tobias Madl tobias.madl@gmail.com
Date: Mon Nov 10 12:19:19 2014 +
changed timer to idle
Change-Id: I46c2ebfae3a62d65ada50410187712ccf4c9c91e
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 10ea920..2972f93 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -36,9 +36,6 @@ using ::sd::framework::FrameworkHelper;
using ::std::vector;
namespace {
-static const sal_Int32 snShortTimeout (100);
-static const sal_Int32 snNormalTimeout (1000);
-static const sal_Int32 snLongTimeout (1);
static const sal_Int32 snShortTimeoutCountThreshold (1);
static const sal_Int32 snNormalTimeoutCountThreshold (5);
}
@@ -70,21 +67,21 @@ ConfigurationUpdater::ConfigurationUpdater (
mbUpdatePending(false),
mbUpdateBeingProcessed(false),
mnLockCount(0),
- maUpdateTimer(),
+ maUpdateIdle(),
mnFailedUpdateCount(0),
mpResourceManager(rpResourceManager)
{
// Prepare the timer that is started when after an update the current
// and the requested configuration differ. With the timer we try
// updates until the two configurations are the same.
-maUpdateTimer.SetTimeout(snNormalTimeout);
-
maUpdateTimer.SetTimeoutHdl(LINK(this,ConfigurationUpdater,TimeoutHandler));
+maUpdateIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
+maUpdateIdle.SetIdleHdl(LINK(this,ConfigurationUpdater,TimeoutHandler));
SetControllerManager(rxControllerManager);
}
ConfigurationUpdater::~ConfigurationUpdater (void)
{
-maUpdateTimer.Stop();
+maUpdateIdle.Stop();
}
void ConfigurationUpdater::SetControllerManager(
@@ -218,13 +215,11 @@ void ConfigurationUpdater::CheckUpdateSuccess (void)
if ( ! AreConfigurationsEquivalent(mxCurrentConfiguration,
mxRequestedConfiguration))
{
if (mnFailedUpdateCount = snShortTimeoutCountThreshold)
-maUpdateTimer.SetTimeout(snShortTimeout);
-else if (mnFailedUpdateCount snNormalTimeoutCountThreshold)
-maUpdateTimer.SetTimeout(snNormalTimeout);
+maUpdateIdle.SetPriority(VCL_IDLE_PRIORITY_LOW);
else
-maUpdateTimer.SetTimeout(snLongTimeout);
+maUpdateIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
++mnFailedUpdateCount;
-maUpdateTimer.Start();
+maUpdateIdle.Start();
}
else
{
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index feb6ad6..382fac6 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -131,7 +131,7 @@ private:
This is used to overcome problems with resources that become
available asynchronously.
*/
-Timer maUpdateTimer;
+Idle maUpdateIdle;
/** The number of failed updates (those after which the current
configuration is not equivalent to the requested configuration) is
commit 8ecc879345a9a6cac980d8c69f28b47b1046ae42
Author: Tobias Madl tobias.madl@gmail.com
Date: Mon Nov 10 12:17:55 2014 +
changed timer to idle, and translated de to en
Change-Id: Ie7789b17a6055e30f67b3a523fd38d221aa8e9ed
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index cb31d36..29da9a6 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -228,7 +228,7 @@ private:
ScScenarioWindowaWndScenarios;
ScDocListBoxaLbDocuments;
-Timer aContentTimer;
+IdleaContentIdle;
OUStringaTitleBase;
OUStringaStrDragMode;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index efd1e80..276bdac 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -49,10 +49,7 @@
#include algorithm
-// Timeout, um Notizen zu suchen
-#define SC_CONTENT_TIMEOUT 1000
-
-// Toleranz, wieviel ueber der eingeklappten Groesse noch klein ist
+// toleance, how much spac above the folded size is still small
#define SCNAV_MINTOL5
// maximum values for UI
@@ -103,9 +100,9 @@ bool ColumnEdit::Notify( NotifyEvent rNEvt )
if ( !aCode.IsMod1() !aCode.IsMod2() )
{
-//! Eingabeueberpruefung (nur Zahlen oder nur Buchstaben, max 2
bzw 3 Stellen)
-//! war vor
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmapex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7623a4832441691a486673cea981ef32b8d72ae7
Author: Tor Lillqvist t...@collabora.com
Date: Mon Nov 10 14:32:09 2014 +0200
Fix error: use of undeclared identifier 'aFileName'
Change-Id: Iff5984a0ab3fec6070cd29a80752f1a8bec1daba
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 330bd59..687cc94 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -115,7 +115,7 @@ void BitmapEx::loadFromIconTheme( const OUString rIconName
)
#ifdef DBG_UTIL
OStringBuffer aErrorStr(
BitmapEx::BitmapEx(): could not load image );
-aErrorStr.append(OUStringToOString(aFileName,
RTL_TEXTENCODING_ASCII_US)).append( via icon theme );
+aErrorStr.append(OUStringToOString(rIconName,
RTL_TEXTENCODING_ASCII_US)).append( via icon theme );
aErrorStr.append(OUStringToOString(aIconTheme,
RTL_TEXTENCODING_ASCII_US)).append('.');
OSL_FAIL(aErrorStr.getStr());
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Migration of Gerrit to new Infrastructure - DOWNTIME planning
Hi all, good news, everyone! Our new infrastructure has proven to be stable and reliable, so the time has come to migrate our gerrit instance to the new platform. This brings quite a nifty benefit: The VM gerrit is running in will then be highly available with redundant storage and seamless automigration between servers. But the downside is that the migration will take some time, in the case of gerrit the pure copying will take about 10hours, starting and reconfiguring the VM afterwards only 10-20Minutes. So a downtime of about 10.5h needs to be planned. My proposal is to start the copying of the vm on Saturday, 29 November, 0900UTC. The downtime will then end around 1930UTC on the same day. I will try to fix the date on Saturday, 15 November, so please comment until then. Thanks, Alex -- Alexander Werner a...@documentfoundation.org Admin Team of The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 Berlin Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Message signed with OpenPGP using GPGMail ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - sd/source sw/inc sw/source
sd/source/ui/docshell/docshel4.cxx | 28 ++--- sd/source/ui/func/bulmaper.cxx | 18 +-- sd/source/ui/func/fubullet.cxx |6 - sd/source/ui/func/fuconbez.cxx |4 sd/source/ui/func/fuconcs.cxx |6 - sd/source/ui/func/fuconrec.cxx | 26 ++--- sd/source/ui/func/fuconstr.cxx | 12 +- sd/source/ui/func/fucopy.cxx | 20 ++-- sd/source/ui/func/fudraw.cxx |2 sd/source/ui/func/fuediglu.cxx |2 sd/source/ui/func/fuexpand.cxx | 10 +- sd/source/ui/func/fuformatpaintbrush.cxx |2 sd/source/ui/func/fuhhconv.cxx |2 sd/source/ui/func/fuinsert.cxx | 16 +-- sd/source/ui/func/fuinsfil.cxx |6 - sd/source/ui/func/fulinend.cxx |2 sd/source/ui/func/fumorph.cxx |6 - sd/source/ui/func/fuoaprms.cxx | 36 +++ sd/source/ui/func/fuolbull.cxx |8 - sd/source/ui/func/fuoltext.cxx |2 sd/source/ui/func/fupage.cxx | 38 +++ sd/source/ui/func/fuparagr.cxx |6 - sd/source/ui/func/fupoor.cxx | 10 +- sd/source/ui/func/fuprlout.cxx | 16 +-- sd/source/ui/func/fuprobjs.cxx |7 - sd/source/ui/func/fuscale.cxx |4 sd/source/ui/func/fusel.cxx|2 sd/source/ui/func/fusldlg.cxx |2 sd/source/ui/func/fusnapln.cxx |6 - sd/source/ui/func/fusumry.cxx |6 - sd/source/ui/func/futempl.cxx | 44 sd/source/ui/func/futext.cxx | 14 +- sd/source/ui/func/futhes.cxx |2 sd/source/ui/func/fuvect.cxx |4 sd/source/ui/func/undopage.cxx |4 sd/source/ui/func/unoaprms.cxx |2 sd/source/ui/inc/unopage.hxx |2 sd/source/ui/slideshow/showwin.cxx |2 sd/source/ui/slideshow/slideshowimpl.cxx |4 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx |2 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |2 sd/source/ui/slidesorter/controller/SlsClipboard.cxx |2 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 sd/source/ui/unoidl/unocpres.cxx |2 sd/source/ui/unoidl/unomodel.cxx | 30 +++--- sd/source/ui/unoidl/unoobj.cxx |6 - sd/source/ui/unoidl/unopage.cxx| 52 +- sd/source/ui/unoidl/unopback.cxx |4 sd/source/ui/view/GraphicObjectBar.cxx |8 - sd/source/ui/view/Outliner.cxx |8 - sd/source/ui/view/ViewClipboard.cxx|2 sd/source/ui/view/ViewShellImplementation.cxx |2 sd/source/ui/view/ViewShellManager.cxx |2 sd/source/ui/view/drawview.cxx | 10 +- sd/source/ui/view/drbezob.cxx |2 sd/source/ui/view/drtxtob.cxx | 18 +-- sd/source/ui/view/drtxtob1.cxx | 42 sd/source/ui/view/drviews1.cxx |4 sd/source/ui/view/drviews2.cxx | 84 - sd/source/ui/view/drviews3.cxx | 60 ++-- sd/source/ui/view/drviews4.cxx | 12 +- sd/source/ui/view/drviews5.cxx |2 sd/source/ui/view/drviews6.cxx | 18 +-- sd/source/ui/view/drviews7.cxx |8 - sd/source/ui/view/drviews9.cxx | 18 +-- sd/source/ui/view/drviewsd.cxx |6 - sd/source/ui/view/drviewse.cxx | 12 +- sd/source/ui/view/drviewsf.cxx | 28 ++--- sd/source/ui/view/drviewsi.cxx |8 - sd/source/ui/view/drviewsj.cxx |8 - sd/source/ui/view/outlnvs2.cxx |8 - sd/source/ui/view/outlnvsh.cxx | 24 ++-- sd/source/ui/view/outlview.cxx |6 - sd/source/ui/view/sdview.cxx | 16 +-- sd/source/ui/view/sdview2.cxx | 30 +++--- sd/source/ui/view/sdview3.cxx
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 283f8f6321158df45415c38790516fa92109b87f
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 10 14:15:14 2014 +0100
vcl: the docs say gdk_window_get_screen was added in GTK+ 2.24
Change-Id: Ib9b108c034181c0f94cbf86634447ba2d4afbaa5
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 50cb193..b8db643 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -294,7 +294,7 @@ GdkX11Pixmap::GdkX11Pixmap( X11Pixmap rOther, GdkWindow
*pWindow )
{
GdkColormap* pColormap;
-#if GTK_CHECK_VERSION(2,10,0)
+#if GTK_CHECK_VERSION(2,24,0)
GdkScreen *pScreen = gdk_window_get_screen( pWindow );
mpGdkPixmap = gdk_pixmap_foreign_new_for_screen( pScreen, mpPixmap,
mnWidth, mnHeight,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - 2 commits - canvas/source officecfg/registry vcl/source
canvas/source/opengl/ogl_canvastools.cxx |8 ++-
canvas/source/opengl/ogl_renderHelper.cxx|2
canvas/source/opengl/ogl_spritedevicehelper.cxx |2
officecfg/registry/data/org/openoffice/Office/Canvas.xcu |4 -
vcl/source/opengl/OpenGLHelper.cxx | 32 ++-
5 files changed, 40 insertions(+), 8 deletions(-)
New commits:
commit f2a39e02dc86dd86cdffaf359f1fba20ed0ff8bc
Author: Michael Jaumann meta_...@yahoo.com
Date: Mon Nov 10 13:24:30 2014 +
additional comments / todos /thoughts
Change-Id: I0aae1c85a685d9153c7b0ab251aed545ef702de8
diff --git a/canvas/source/opengl/ogl_canvastools.cxx
b/canvas/source/opengl/ogl_canvastools.cxx
index 64f5dc4..0022905 100644
--- a/canvas/source/opengl/ogl_canvastools.cxx
+++ b/canvas/source/opengl/ogl_canvastools.cxx
@@ -28,6 +28,7 @@ using namespace ::com::sun::star;
namespace oglcanvas
{
/// triangulates polygon before
+//move to canvashelper, or take renderHelper as parameter?
void renderComplexPolyPolygon( const ::basegfx::B2DPolyPolygon rPolyPoly )
{
::basegfx::B2DPolyPolygon aPolyPoly(rPolyPoly);
@@ -52,6 +53,7 @@ namespace oglcanvas
better not leave triangulation to OpenGL. also, ignores texturing
*/
+//move to canvashelper, or take renderHelper as parameter?
void renderPolyPolygon( const ::basegfx::B2DPolyPolygon rPolyPoly )
{
::basegfx::B2DPolyPolygon aPolyPoly(rPolyPoly);
@@ -60,6 +62,7 @@ namespace oglcanvas
for( sal_uInt32 i=0; iaPolyPoly.count(); i++ )
{
+
glBegin(GL_LINE_STRIP);
const ::basegfx::B2DPolygon rPolygon( aPolyPoly.getB2DPolygon(i)
);
@@ -75,7 +78,7 @@ namespace oglcanvas
glEnd();
}
}
-
+//makes it sence to enable evrytime glBlend glBlendfunc...?
glm::mat4 setupState( const ::basegfx::B2DHomMatrix rTransform,
GLenum eSrcBlend,
GLenum eDstBlend)
@@ -93,6 +96,7 @@ namespace oglcanvas
return glm::make_mat4(aGLTransform);
}
+//What does it make,
void renderOSD( const std::vectordouble rNumbers, double scale )
{
double y=4.0;
@@ -105,7 +109,7 @@ namespace oglcanvas
{
aTmp.identity();
aTmp.translate(0,y);
-y += 1.2*scale;
+y += 1.2*scale; //send to renderHelper
basegfx::B2DPolyPolygon aPoly=
basegfx::tools::number2PolyPolygon(rNumbers[i],10,3);
diff --git a/canvas/source/opengl/ogl_renderHelper.cxx
b/canvas/source/opengl/ogl_renderHelper.cxx
index 36a1306..c6b127a 100644
--- a/canvas/source/opengl/ogl_renderHelper.cxx
+++ b/canvas/source/opengl/ogl_renderHelper.cxx
@@ -37,7 +37,7 @@ namespace oglcanvas
m_simplePosAttrb = glGetAttribLocation(m_simpleProgID ,vPosition);
m_texPosAttrb = glGetAttribLocation(m_texProgID ,vPosition);
-glViewport(0, 0, m_iWidth, m_iHeight);
+//glViewport(0, 0, m_iWidth, m_iHeight);
}
//Todo figgure out, which parameters i should use :)
void RenderHelper::SetVP(int width, int height)
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 5d8ed44..92820ce 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -109,7 +109,7 @@ namespace oglcanvas
// init window context
initContext();
mRenderHelper.InitOpenGL();
-mRenderHelper.SetVP(1600, 900);//is this right?
+mRenderHelper.SetVP(1200, 600);//is this right?
mnLinearMultiColorGradientProgram =
OpenGLHelper::LoadShaders(dummyVertexShader,
linearMultiColorGradientFragmentShader);
diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
index 377f211..4a621d2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
@@ -46,10 +46,10 @@
/node
node oor:name=com.sun.star.rendering.SpriteCanvas oor:op=replace
prop oor:name=PreferredImplementations oor:type=oor:string-list
-value
oor:separator=,com.sun.star.comp.rendering.SpriteCanvas.OGL!--,
+value oor:separator=,com.sun.star.comp.rendering.SpriteCanvas.OGL,
com.sun.star.comp.rendering.SpriteCanvas.Cairo,
com.sun.star.comp.rendering.SpriteCanvas.VCL,
- com.sun.star.comp.rendering.SpriteCanvas.DX9
--
+ com.sun.star.comp.rendering.SpriteCanvas.DX9
/value
/prop
prop oor:name=AcceleratedImplementations oor:type=oor:string-list
commit 77e419947fe32142ebb7e69d0865e4e7b0433250
Author:
Re: Migration of Gerrit to new Infrastructure - DOWNTIME planning
On Mon, Nov 10, 2014 at 6:58 AM, Alexander Werner a...@documentfoundation.org wrote: Hi all, good news, everyone! Our new infrastructure has proven to be stable and reliable, so the time has come to migrate our gerrit instance to the new platform. This brings quite a nifty benefit: The VM gerrit is running in will then be highly available with redundant storage and seamless automigration between servers. But the downside is that the migration will take some time, in the case of gerrit the pure copying will take about 10hours, starting and reconfiguring the VM afterwards only 10-20Minutes. So a downtime of about 10.5h needs to be planned. My proposal is to start the copying of the vm on Saturday, 29 November, 0900UTC. The downtime will then end around 1930UTC on the same day. I will try to fix the date on Saturday, 15 November, so please comment until then. Thanks. Sound good to me. Let's remember to send email reminders to the ML just before and just after it, and put that info in irc's topic of #libreoffice-dev I'll be around most likely for the end of it (but prolly not at the start :-D) moggi, vmiklos, bjoern... you may want to keep an eye on the various 'Bots' to irc/bugzilla etc... Norbert PS alex: Let's make _sure_ to keep the rsa host key of the gerrit vm while migrating :-) PS2: to all: if your known_host happen to have the ip and not the hostname for gerrit and/or if you have some extra security that do track the ip anyway, you may have to tweak things after the migration as, obviously, the IP of the gerrit server will change. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Migration of Gerrit to new Infrastructure - DOWNTIME planning
On Mon, Nov 10, 2014 at 01:58:30PM +0100, Alexander Werner wrote: My proposal is to start the copying of the vm on Saturday, 29 November, 0900UTC. The downtime will then end around 1930UTC on the same day. I will try to fix the date on Saturday, 15 November, so please comment until then. What is the plan to show on gerrit.libreoffice.org during downtime? Something static like: LibreOffice gerrit is currently migrating to new hardware, we expect to be online again on $foo. You can either wait and hold back your commits locally until then, or if you have a super urgent change you need to discuss, send it as an oldschool patch to the mailing list at libreoffice@lists.freedesktop.org for discussion. Please note that you can find the friendly folks of LibreOffice development on the #libreoffice-dev channel on freenode IRC[irc://chat.freenode.net/libreoffice-dev]. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - external/libabw external/libcdr external/libebook external/libetonyek external/libgltf external/libmspub external/libmwaw external/libodfgen external/liborc
external/libabw/ExternalProject_libabw.mk |2 +- external/libcdr/ExternalProject_libcdr.mk |2 +- external/libebook/ExternalProject_libebook.mk |2 +- external/libetonyek/ExternalProject_libetonyek.mk |2 +- external/libgltf/ExternalProject_libgltf.mk |3 +-- external/libmspub/ExternalProject_libmspub.mk |2 +- external/libmwaw/ExternalProject_libmwaw.mk |4 +++- external/libodfgen/ExternalProject_libodfgen.mk |2 +- external/liborcus/ExternalProject_liborcus.mk |4 external/libpagemaker/ExternalProject_libpagemaker.mk |2 +- external/librevenge/ExternalProject_librevenge.mk |2 +- external/libvisio/ExternalProject_libvisio.mk |2 +- external/libwps/ExternalProject_libwps.mk |2 +- 13 files changed, 14 insertions(+), 17 deletions(-) New commits: commit 1413b6a4fd6cd0909115566c94882bbc82f43b39 Author: Michael Stahl mst...@redhat.com Date: Mon Nov 10 15:08:29 2014 +0100 external: fortunately boost no longer requires config_host.mk Change-Id: I8f2176500bf620cd5e4cdf434e6122b6163b3e0f diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index 49a2645..d45ef05 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) : --disable-werror \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ - -I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \ + -I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(MAKE) \ ) diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 174de18..67f79b6 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-werror \ --disable-weffc \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \ + CXXFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(MAKE) \ ) diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index ca1c7e4..1bc7f7c 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ - CXXFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \ + CXXFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ XML_CFLAGS=$(LIBXML_CFLAGS) \ XML_LIBS=$(LIBXML_LIBS) \ REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \ diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 0d281b5..9f57a10 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --disable-weffc \ --without-tools \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - BOOST_CFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \ + BOOST_CFLAGS=$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ XML_CFLAGS=$(LIBXML_CFLAGS) \ XML_LIBS=$(LIBXML_LIBS) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/external/libgltf/ExternalProject_libgltf.mk
[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/boost/smart_ptr.py | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit e639c4e2a43d4378af263f062b3ca06af8ed8c15
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 10 15:29:11 2014 +0100
Do not deref (potentially dangling) weak_ptr
Change-Id: Ic9694aa8bd85fe0548b8f5fc5f52b4bbd6dce1cf
diff --git a/solenv/gdb/boost/smart_ptr.py b/solenv/gdb/boost/smart_ptr.py
index 6646e12..60d8827 100644
--- a/solenv/gdb/boost/smart_ptr.py
+++ b/solenv/gdb/boost/smart_ptr.py
@@ -41,6 +41,16 @@ class SmartPtrPrinter:
else:
return empty %s % (self.typename)
+class WeakPtrPrinter:
+Prints boost::weak_ptr instances
+
+def __init__(self, typename, value):
+self.typename = typename
+self.value = value
+
+def to_string(self):
+value = self.value['px']
+return %s %s % (self.typename, value)
printer = None
@@ -54,7 +64,7 @@ def build_pretty_printers():
printer.add('boost::shared_ptr', SmartPtrPrinter)
# printer.add('boost::shared_array', SmartPtrPrinter)
-printer.add('boost::weak_ptr', SmartPtrPrinter)
+printer.add('boost::weak_ptr', WeakPtrPrinter)
printer.add('boost::scoped_ptr', SmartPtrPrinter)
# printer.add('boost::scoped_array', SmartPtrPrinter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] Branch libreoffice-4-3-4 and Tag libreoffice-4.3.4.1 created
Hi all, The tag libreoffice-4.3.4.1 (AKA 4.3.4 RC1) and the corresponding branch libreoffice-4-3-4 have been created. The branch will be used for fine tuning of the 4.3.4 release. (it is an intermediate release addressing the change in sorting behaviour) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-3' branch is still active and will be used for the 4.3.5 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.4_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3-3 origin/libreoffice-4-3-4 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.4.1 libreoffice-4.3.4.1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-3-4 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.3 RC2 (4.3.3 final) Happy hacking, Christian + fix slide pane cut/copy/paste in outline view (bnc#624546) [Marco Cecchetti] + fix cherry-pick mis-merge (bnc#636128) [Miklos Vajna, Stephan Bergmann] + SwTxtFrm::FormatAdjust: still call SplitFrm if we have columns (bnc#800714) [Miklos Vajna] + fix docx redline import (bnc#821804) [Luboš Luňák] + RTF import: fix paragraph spacing handling in tables (bnc#825305) [Miklos Vajna] + XLS export: external sheet references on Linux/OSX (bnc#893791) [Andras Timar] + various untrusted loop bounds (coverity#138) [Caolán McNamara] + various untrusted loop bounds (coverity#1242573) [Caolán McNamara] + various untrusted loop bounds (coverity#1242582) [Caolán McNamara] + various untrusted loop bounds (coverity#1242606) [Caolán McNamara] + various untrusted loop bounds (coverity#1242624) [Caolán McNamara] + various untrusted loop bounds (coverity#1242704) [Caolán McNamara] + various untrusted loop bounds (coverity#1242717) [Caolán McNamara] + various untrusted loop bounds (coverity#1242724) [Caolán McNamara] + various untrusted loop bounds (coverity#1242778) [Caolán McNamara] + various untrusted loop bounds (coverity#1242908) [Caolán McNamara] + fix shift+click to select multiple drawings (fdo#37960) [Andras Timar] + RTF import: fix paragraph spacing handling in tables (fdo#44736) [Miklos Vajna] + fix word count with recorded changes (fdo#46757) [Caolán McNamara] + chart background in XLSX is transparent instead of white. (fdo#54361) [Muthu Subramanian] + center ellipsis tooltips that don't fit on screen (fdo#55546) [Caolán McNamara] + allow export of VBAProject (fdo#60904) [Caolán McNamara] + crash on second export of svg (fdo#62682) [Caolán McNamara] + crash on negative position in redlined word (fdo#65823) [Caolán McNamara] + fix word count with recorded changes (fdo#68347) [Caolán McNamara] + excel VBA: ActiveDocument is not tracking currently selected Doc (fdo#71248) [Justin Luth] + : CMIS: Default Alfresco 4 URL not working (fdo#71781) [Julien Nabet] + make template dialog Modal (fdo#72587) [Caolán McNamara] + broadcast changes after TextToColumn (fdo#74014) [Eike Rathke] + [Accessiblity] Don't expose 0 for empty cells in Calc (fdo#74441) [Niklas Johansson] + SIFR: Line Spacing 1.5 icon missing (4.3) (fdo#75359) [Yousuf Philips] + set spinbox value AFTER adjusting no. of decimal places (fdo#77319) [Katarina Behrens] + sw: fix text formatting of proportional line space 100% (fdo#79602) [Michael Stahl] + avoid broadcasting during cell delete shift. (fdo#80284) [Kohei Yoshida] + broadcast changes before EndUndo(). (fdo#80846) [Kohei Yoshida] + accessiblitiy focus not tracked for cells in Calc (fdo#81264) [Niklas Johansson] + custom property with the same name as Document Property not imported (fdo#81486) [Charu Tyagi] + add a hidden configuration option to toggle ref update on sort. (fdo#81633) [Kohei Yoshida] + correctly adjust references in range names on row deletion. (fdo#82047) [Kohei Yoshida] + RTF import: handle footnote in table cell (fdo#82076) [Miklos Vajna] + grabbing focus can invalidate the entries (fdo#82270) [Caolán McNamara] + MSVC build: disable a few more cases of SSE2 in externals (fdo#82430) [Michael Stahl]
[Libreoffice-commits] core.git: Branch 'feature/priorities' - cui/source
cui/source/dialogs/linkdlg.cxx |4 ++--
cui/source/inc/linkdlg.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 39e1a64e14098cf04ce03c9d1c47af159c138d69
Author: Tobias Madl tobias.madl@gmail.com
Date: Mon Nov 10 14:37:14 2014 +
changed timer to idle
Change-Id: I713976070359e1f5628e7b34f7fd8f6f26b2372e
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index a6909d6..5f515db 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -123,8 +123,8 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent,
LinkManager* pMgr, bool b
m_pTbLinks-Resize(); // OS: hack for correct selection
// UpdateTimer for DDE-/Grf-links, which are waited for
-aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl )
);
-aUpdateTimer.SetTimeout( 1000 );
+aUpdateIdle.SetIdleHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
+aUpdateIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
m_pPbOpenSource-Hide();
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index d5440bd..64e9b87 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -61,7 +61,7 @@ class SvBaseLinksDlg : public ModalDialog
OUString aStrWaitinglink;
sfx2::LinkManager* pLinkMgr;
boolbHtmlMode;
-Timer aUpdateTimer;
+Idle aUpdateIdle;
DECL_LINK( LinksSelectHdl, SvTabListBox * );
DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
@@ -78,7 +78,7 @@ class SvBaseLinksDlg : public ModalDialog
void SetType( sfx2::SvBaseLink rLink, sal_uLong nPos, sal_uInt16 nType );
void InsertEntry( const sfx2::SvBaseLink rLink, sal_uLong nPos =
TREELIST_APPEND, bool bSelect = false);
-void StartUpdateTimer() { aUpdateTimer.Start(); }
+void StartUpdateTimer() { aUpdateIdle.Start(); }
OUString Autolink() { return aStrAutolink; }
OUString Manuallink(){ return aStrManuallink; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - dbaccess/source editeng/source include/svtools include/svx include/vcl reportdesign/source sc/inc sc/source sd/source svtools/source svx/s
dbaccess/source/ui/inc/JoinTableView.hxx |2 -
dbaccess/source/ui/querydesign/JoinTableView.cxx | 18 ++--
editeng/source/editeng/impedit.hxx |6 ++--
editeng/source/editeng/impedit2.cxx |6 ++--
editeng/source/editeng/impedit3.cxx |2 -
editeng/source/editeng/impedit4.cxx |4 +-
include/svtools/wizdlg.hxx |2 -
include/svx/sidebar/PanelLayout.hxx |2 -
include/vcl/syswin.hxx |4 +-
reportdesign/source/ui/inc/DesignView.hxx|2 -
reportdesign/source/ui/report/DesignView.cxx | 12
sc/inc/document.hxx |2 -
sc/source/core/data/documen2.cxx | 14 -
sc/source/ui/inc/conflictsdlg.hxx|2 -
sc/source/ui/miscdlgs/conflictsdlg.cxx |6 ++--
sd/source/ui/dlg/dlgass.cxx | 33 +++
svtools/source/dialogs/wizdlg.cxx| 14 -
svx/source/dialog/_contdlg.cxx | 18 ++--
svx/source/dialog/contimp.hxx|4 +-
svx/source/sidebar/PanelLayout.cxx | 10 +++---
sw/source/uibase/inc/swruler.hxx |2 -
sw/source/uibase/misc/swruler.cxx| 10 +++---
vcl/source/window/syswin.cxx | 10 +++---
23 files changed, 92 insertions(+), 93 deletions(-)
New commits:
commit 0125ded66c28458591e88d118337c1985767c900
Author: Jennifer Liebel jliebe...@gmail.com
Date: Mon Nov 10 14:57:14 2014 +
changed timers to idle
Change-Id: I5846940cc45781f4a0264047107dbb568604d543
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx
b/dbaccess/source/ui/inc/JoinTableView.hxx
index c9c5002..a14be0d 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -85,7 +85,7 @@ namespace dbaui
OTableWindowMap m_aTableMap;
::std::vectorOTableConnection*m_vTableConnection;
-Timer m_aDragScrollTimer;
+Idlem_aDragScrollIdle;
Rectangle m_aDragRect;
Rectangle m_aSizingRect;
Point m_aDragOffset;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 2944efc..29b64ef 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -169,7 +169,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent,
OJoinDesignView* pView )
InitColors();
-m_aDragScrollTimer.SetTimeoutHdl(LINK(this, OJoinTableView,
OnDragScrollTimer));
+m_aDragScrollIdle.SetIdleHdl(LINK(this, OJoinTableView,
OnDragScrollTimer));
}
OJoinTableView::~OJoinTableView()
@@ -717,8 +717,8 @@ void OJoinTableView::Tracking( const TrackingEvent rTEvt )
{
if( m_pDragWin )
{
-if (m_aDragScrollTimer.IsActive())
-m_aDragScrollTimer.Stop();
+if (m_aDragScrollIdle.IsActive())
+m_aDragScrollIdle.Stop();
// adjust position of child after moving
// windows are not allowed to leave display range
@@ -777,8 +777,8 @@ void OJoinTableView::Tracking( const TrackingEvent rTEvt )
}
else if (rTEvt.IsTrackingCanceled())
{
-if (m_aDragScrollTimer.IsActive())
-m_aDragScrollTimer.Stop();
+if (m_aDragScrollIdle.IsActive())
+m_aDragScrollIdle.Stop();
EndTracking();
}
else
@@ -990,8 +990,8 @@ bool OJoinTableView::ScrollWhileDragging()
OSL_ENSURE(m_pDragWin != NULL, OJoinTableView::ScrollWhileDragging must
not be called when a window is being dragged !);
// kill the timer
-if (m_aDragScrollTimer.IsActive())
-m_aDragScrollTimer.Stop();
+if (m_aDragScrollIdle.IsActive())
+m_aDragScrollIdle.Stop();
Point aDragWinPos = m_ptPrevDraggingPos - m_aDragOffset;
Size aDragWinSize = m_pDragWin-GetSizePixel();
@@ -1049,8 +1049,8 @@ bool OJoinTableView::ScrollWhileDragging()
// resetting timer, if still necessary
if (bNeedScrollTimer)
{
-m_aDragScrollTimer.SetTimeout(100);
-m_aDragScrollTimer.Start();
+m_aDragScrollIdle.SetPriority(VCL_IDLE_PRIORITY_LOW);
+m_aDragScrollIdle.Start();
}
// redraw DraggingRect
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 9c44b36..a6f50ad 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -464,7 +464,7 @@ private:
IdleFormattter aIdleFormatter;
-Timer aOnlineSpellTimer;
+IdleaOnlineSpellIdle;
// If it is detected at one point that the StatusHdl has to be called, but
// this should not happen
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/unx
vcl/unx/generic/gdi/openglx11cairotextrender.cxx | 50 +++
vcl/unx/generic/gdi/openglx11cairotextrender.hxx | 26 +++
2 files changed, 76 insertions(+)
New commits:
commit 70d1c7289ad9c2b36cfca9f931755e1c4f78a449
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Nov 10 07:09:59 2014 +0100
forgot to add the files
Change-Id: I44a7e9bec213514708e4c971479660574508ad1b
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
new file mode 100644
index 000..9b7c49e
--- /dev/null
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include openglx11cairotextrender.hxx
+
+#include salbmp.hxx
+#include vcl/salbtype.hxx
+
+#include cairo-svg.h
+
+OpenGLX11CairoTextRender::OpenGLX11CairoTextRender(bool bPrinter,
X11SalGraphics rParent):
+X11CairoTextRender(bPrinter, rParent)
+{
+}
+
+cairo_surface_t* OpenGLX11CairoTextRender::getCairoSurface()
+{
+// static size_t id = 0;
+// OString aFileName = OString(/tmp/libo_logs/text_rendering) +
OString::number(id++) + OString(.svg);
+// cairo_surface_t* surface = cairo_svg_surface_create(aFileName.getStr(),
GetWidth(), GetHeight());
+cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
GetWidth(), GetHeight());
+return surface;
+}
+
+void OpenGLX11CairoTextRender::drawSurface(cairo_t* cr)
+{
+cairo_surface_t* surface = cairo_get_target(cr);
+int width = cairo_image_surface_get_width(surface);
+int height = cairo_image_surface_get_height(surface);
+SalBitmap* pBitmap = ImplGetSVData()-mpDefInst-CreateSalBitmap();
+pBitmap-Create(Size(width, height), 24, BitmapPalette());
+BitmapBuffer* pBuffer = pBitmap-AcquireBuffer(false);
+std::memcpy(pBuffer-mpBits, cairo_image_surface_get_data(surface),
width*height*3);
+pBitmap-ReleaseBuffer(pBuffer, false);
+SalTwoRect aRect;
+aRect.mnSrcX = 0;
+aRect.mnSrcY = 0;
+aRect.mnSrcWidth = width;
+aRect.mnSrcHeight = height;
+mrParent.drawBitmap(aRect, *pBitmap);
+delete pBitmap;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
new file mode 100644
index 000..87ef948
--- /dev/null
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX
+#define INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX value
+
+#include x11cairotextrender.hxx
+
+class OpenGLX11CairoTextRender : public X11CairoTextRender
+{
+public:
+OpenGLX11CairoTextRender(bool bPrinter, X11SalGraphics rParent);
+
+virtual cairo_surface_t* getCairoSurface() SAL_OVERRIDE;
+virtual void drawSurface(cairo_t* cr) SAL_OVERRIDE;
+};
+
+#endif
+
+/* 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: sc/qa
sc/qa/unit/filters-test.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit cb3b282dac04178ac21334b70f03a4acecb65354
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Nov 10 13:00:24 2014 +0100
Revert Disable problematic sorting test that depends on the old default.
Not necessary after 447d523fa7c6c82476f9ee48e4b9c82cfad05c50.
This reverts commit 7f86fc0b9835be4d2c3e98271b32454f8df427ec.
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 80a..f8a911f 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -561,10 +561,6 @@ void ScFiltersTest::testEnhancedProtectionXLSX()
void ScFiltersTest::testSortWithSharedFormulasODS()
{
-// This depends on the old 'new' sorting default, and from this
-// test it is overly hard to change that setting cleanly, so
-// disable for now until we can re-work this test.
-#if 0
ScDocShellRef xDocSh = loadDoc(shared-formula/sort-crash., ODS, true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument rDoc = xDocSh-GetDocument();
@@ -610,7 +606,6 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
CPPUNIT_ASSERT_EQUAL(static_castSCROW(15), pFC-GetSharedLength());
xDocSh-DoClose();
-#endif
}
// https://bugs.freedesktop.org/attachment.cgi?id=100089 from fdo#77018
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 726e1a49bd40d98ffcfba760a08c503b096c79bd Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Mon Nov 10 15:34:10 2014 +0100 wrong merge conflict resolution, vcldemo, icontest go to instdir Change-Id: Iefcca922fc824877c49a11cd68023d57eff22d2f diff --git a/Repository.mk b/Repository.mk index 3d3e35a..e62f632 100644 --- a/Repository.mk +++ b/Repository.mk @@ -68,9 +68,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svpclient \ pixelctl ) \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ - $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \ - outdevgrind) \ - vcldemo \ tiledrendering \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ )) @@ -150,6 +147,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(if $(filter WNT,$(OS)), \ senddoc \ ) \ + $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \ + outdevgrind) \ + vcldemo \ )) ifeq ($(OS),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/source
scp2/source/ooo/file_ooo.scp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit cbf7cb4ab0c76932dd5e0db3958c163fac459114 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 6 14:11:35 2014 +0100 fdo#82038: senddoc, uri-encode got lost on Mac (cherry picked from commit f3f63f555df87449b2d2a33718589b3afb3d9ddf) Conflicts: Repository.mk scp2/source/ooo/file_ooo.scp Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9 Reviewed-on: https://gerrit.libreoffice.org/12289 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9b11d66..0bb375d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -200,7 +200,7 @@ End #endif -#if defined UNX ! defined MACOSX +#if defined UNX File gid_File_Bin_Uri_Encode BIN_FILE_BODY; @@ -211,7 +211,7 @@ End #endif -#if defined UNX ! defined MACOSX +#if defined UNX File gid_File_Bin_Senddoc BIN_FILE_BODY; Dir = FILELIST_DIR; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - filter/source oox/source sc/source sc/uiconfig sw/source sw/uiconfig vcl/unx
filter/source/graphicfilter/ipsd/ipsd.cxx | 12 ++---
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 39 +---
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 12 ++---
oox/source/crypto/CryptTools.cxx |8 +--
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx |6 +-
sc/uiconfig/scalc/ui/consolidatedialog.ui | 42 --
sc/uiconfig/scalc/ui/insertsheet.ui | 23 -
sw/source/ui/table/tautofmt.cxx | 14 +++---
sw/uiconfig/swriter/ui/autoformattable.ui |2
vcl/unx/generic/gdi/pixmap.cxx|1
10 files changed, 119 insertions(+), 40 deletions(-)
New commits:
commit e2dde6a4d149301557c18d0bcb474fb187ee09e8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 10 15:58:03 2014 +
mpPixmap uninitialized in one ctor
Change-Id: Iffa82b96610dd1fe5900ca796af413a116d2dd28
diff --git a/vcl/unx/generic/gdi/pixmap.cxx b/vcl/unx/generic/gdi/pixmap.cxx
index beb5589..c30b9af 100644
--- a/vcl/unx/generic/gdi/pixmap.cxx
+++ b/vcl/unx/generic/gdi/pixmap.cxx
@@ -12,6 +12,7 @@
X11Pixmap::X11Pixmap()
: mpDisplay( NULL )
, mnScreen( 0 )
+, mpPixmap( 0 )
, mnWidth( -1 )
, mnHeight( -1 )
, mnDepth( 0 )
commit 27da3f669859dd57d20b94258243ea57d6f5f098
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 10 14:36:41 2014 +
coverity#1202754 Bad bit shift operation
Change-Id: I51e8df896897b122965ada0ced161570d38f0468
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx
b/filter/source/graphicfilter/ipsd/ipsd.cxx
index c95991d..451a4bf 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -356,14 +356,14 @@ bool PSDReader::ImplReadBody()
}
if ( nRunCount 0x80 ) // a run length packet
{
-if ( nBitCount == -1 ) // bits left in nDat?
-{
-m_rPSD.ReadUChar( nDat );
-nDat ^= 0xff;
-nBitCount = 7;
-}
for ( sal_uInt16 i = 0; i ( -nRunCount + 1 ); i++ )
{
+if ( nBitCount == -1 ) // bits left in nDat?
+{
+m_rPSD.ReadUChar( nDat );
+nDat ^= 0xff;
+nBitCount = 7;
+}
mpWriteAcc-SetPixelIndex( nY, nX, nDat nBitCount--
);
if ( ++nX == mpFileHeader-nColumns )
{
commit 17796bfb2593ff988f2ed68f6dc4a36f705f148c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 10 14:30:33 2014 +
coverity#1130169 Unchecked return value
Change-Id: I62ed42412a0cafa33ddafe536723f5e336c92a7a
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 4e0d189..f5b0769 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -137,11 +137,11 @@ sal_uInt32 Decrypt::update(vectorsal_uInt8 output,
vectorsal_uInt8 input,
sal_uInt32 actualInputLength = inputLength == 0 || inputLength
input.size() ? input.size() : inputLength;
#if USE_TLS_OPENSSL
-EVP_DecryptUpdate( mContext, output[0], outputLength, input[0],
actualInputLength );
+(void)EVP_DecryptUpdate( mContext, output[0], outputLength, input[0],
actualInputLength );
#endif // USE_TLS_OPENSSL
#if USE_TLS_NSS
-PK11_CipherOp( mContext, output[0], outputLength, actualInputLength,
input[0], actualInputLength );
+(void)PK11_CipherOp( mContext, output[0], outputLength,
actualInputLength, input[0], actualInputLength );
#endif // USE_TLS_NSS
return static_castsal_uInt32(outputLength);
@@ -185,11 +185,11 @@ sal_uInt32 Encrypt::update(vectorsal_uInt8 output,
vectorsal_uInt8 input,
sal_uInt32 actualInputLength = inputLength == 0 || inputLength
input.size() ? input.size() : inputLength;
#if USE_TLS_OPENSSL
-EVP_EncryptUpdate( mContext, output[0], outputLength, input[0],
actualInputLength );
+(void)EVP_EncryptUpdate( mContext, output[0], outputLength, input[0],
actualInputLength );
#endif // USE_TLS_OPENSSL
#if USE_TLS_NSS
-PK11_CipherOp( mContext, output[0], outputLength, actualInputLength,
input[0], actualInputLength );
+(void)PK11_CipherOp( mContext, output[0], outputLength,
actualInputLength, input[0], actualInputLength );
#endif // USE_TLS_NSS
return static_castsal_uInt32(outputLength);
commit 735f3a94b92ac93d11f66c3a86edc42e1915b337
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 10 11:31:58 2014 +
Related: fdo#85111 put a box around xml filter settings control
and writer-insert-table-autoformat
and calc-data-consolidate
and calc-insert-sheet
Change-Id:
[Libreoffice-commits] core.git: Branch 'feature/priorities' - svtools/source
svtools/source/contnr/imivctl.hxx |6 +++---
svtools/source/contnr/imivctl1.cxx |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 18623657715039ccbadfb4a0be9ad35a34a3784c
Author: Tobias Madl tobias.madl@gmail.com
Date: Mon Nov 10 16:19:19 2014 +
Changed timer to idle
Change-Id: Id1de5f1ee73fbef9ddebd6642ab8c9b558be4d71
diff --git a/svtools/source/contnr/imivctl.hxx
b/svtools/source/contnr/imivctl.hxx
index 24c3bdd..03a9d06 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -164,7 +164,7 @@ class SvxIconChoiceCtrl_Impl
ScrollBarBoxaScrBarBox;
Rectangle aCurSelectionRect;
std::vectorRectangle* aSelectedRectList;
-Timer aEditTimer; // for editing in place
+IdleaEditIdle; // for editing in place
Timer aAutoArrangeTimer;
Timer aDocRectChangedTimer;
Timer aVisRectChangedTimer;
@@ -251,8 +251,8 @@ class SvxIconChoiceCtrl_Impl
voidToggleSelection( SvxIconChoiceCtrlEntry* );
voidDeselectAllBut( SvxIconChoiceCtrlEntry*, bool
bPaintSync = false );
voidCenter( SvxIconChoiceCtrlEntry* pEntry ) const;
-voidStopEditTimer() { aEditTimer.Stop(); }
-voidStartEditTimer() { aEditTimer.Start(); }
+voidStopEditTimer() { aEditIdle.Stop(); }
+voidStartEditTimer() { aEditIdle.Start(); }
voidImpHideDDIcon();
voidCallSelectHandler( SvxIconChoiceCtrlEntry* );
voidSelectRect(
diff --git a/svtools/source/contnr/imivctl1.cxx
b/svtools/source/contnr/imivctl1.cxx
index bee6011..9843c5b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -135,8 +135,8 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
nHorSBarHeight = aHorSBar.GetSizePixel().Height();
nVerSBarWidth = aVerSBar.GetSizePixel().Width();
-aEditTimer.SetTimeout( 800 );
-aEditTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,EditTimeoutHdl));
+aEditIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
+aEditIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,EditTimeoutHdl));
aAutoArrangeTimer.SetTimeout( 100 );
aAutoArrangeTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,AutoArrangeHdl));
aCallSelectHdlTimer.SetTimeout( 500 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dbaccess/uiconfig
dbaccess/uiconfig/ui/queryfilterdialog.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4188f610144bc88e7fbc5a7aee174a4d760f3f51 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Nov 10 00:19:32 2014 +0100 Resolves fdo#82500: Operators missing in Standard Filter Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=be88126e80b1f6b9a3090ba4617d9a87dfb0a0bd Cherry-picked from 3d16e8593ac1e9d90f0a033732766907476822f9 Change-Id: I4f03fbf4e6e6a0f6a901cadb87494baa92d66895 Reviewed-on: https://gerrit.libreoffice.org/12328 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui index d03584a..bf2ba3a 100644 --- a/dbaccess/uiconfig/ui/queryfilterdialog.ui +++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui @@ -155,9 +155,9 @@ item translatable=yes=/item item translatable=yeslt;gt;/item item translatable=yeslt;/item - item translatable=yes=/item + item translatable=yeslt;=/item item translatable=yesgt;/item - item translatable=yes=/item + item translatable=yesgt;=/item item translatable=yeslike/item item translatable=yesnot like/item item translatable=yesnull/item ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: new git bugzilla script
On 10/27/2014 02:00 PM, Markus Mohrhard wrote: As it is a complete new implementation you should report any problems as soon as possible. Especially in the beta and the RC phase. I used the old script as a guideline but there are some special portions in it that can only be tested between the first beta and the last RC. https://bugs.freedesktop.org/show_bug.cgi?id=82038#c22 (mentioning 4.3.4) and preceding change that added target:4.3.4 to the bug's whiteboard are about a commit to libreoffice-4-3 done after branching off libreoffice-4-3-4, so should talk about 4.3.5 instead of 4.3.4. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source vcl/unx vcl/win
include/vcl/opengl/OpenGLHelper.hxx |5 +
vcl/source/opengl/OpenGLHelper.cxx | 17 +++--
vcl/unx/generic/gdi/salbmp.cxx |5 +
vcl/unx/generic/gdi/salgdi.cxx |6 +-
vcl/win/source/gdi/salgdi.cxx |4 +---
5 files changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 45c6cb5f083934f311561599d34ce771bbabf835
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Nov 10 16:02:31 2014 +
vcl: cleanup the opengl selection API.
Change-Id: Icebf3c7d2911b27e29d2259b780a04048b293b3c
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index d49f579..ee5a9f8 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -58,6 +58,11 @@ public:
*/
static bool supportsVCLOpenGL();
+/**
+ * Returns true if VCL has OpenGL rendering enabled
+ */
+static bool isVCLOpenGLEnabled();
+
#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo
rVI);
static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool bInverted );
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 5823b80..d9f445d 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -18,6 +18,7 @@
#include boost/scoped_array.hpp
#include vcl/pngwrite.hxx
#include vcl/graph.hxx
+#include officecfg/Office/Common.hxx
#include vector
@@ -360,8 +361,20 @@ void OpenGLHelper::checkGLError(const char* pFile, size_t
nLine)
bool OpenGLHelper::supportsVCLOpenGL()
{
-static bool bDisableGL = !getenv(SAL_DISABLEGL);
-return bDisableGL;
+static bool bDisableGL = !!getenv(SAL_DISABLEGL);
+
+if (bDisableGL)
+return false;
+else
+return true;
+}
+
+bool OpenGLHelper::isVCLOpenGLEnabled()
+{
+if (!supportsVCLOpenGL())
+return false;
+bool bEnable = officecfg::Office::Common::VCL::UseOpenGL::get();
+return bEnable;
}
#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 6b2042c..f36795a 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -45,7 +45,6 @@
#include opengl/salbmp.hxx
#include vcl/opengl/OpenGLHelper.hxx
-#include officecfg/Office/Common.hxx
#if defined HAVE_VALGRIND_HEADERS
#include valgrind/memcheck.h
@@ -57,9 +56,7 @@
SalBitmap* X11SalInstance::CreateSalBitmap()
{
-static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL();
-bool bUseOpenGL = bOpenGLPossible ?
officecfg::Office::Common::VCL::UseOpenGL::get() : false;
-if (bUseOpenGL)
+if (OpenGLHelper::isVCLOpenGLEnabled())
return new OpenGLSalBitmap();
else
return new X11SalBitmap();
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 47b20bc..9609ec8 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -62,8 +62,6 @@
#include generic/printergfx.hxx
#include xrender_peer.hxx
-#include officecfg/Office/Common.hxx
-
#include vcl/opengl/OpenGLHelper.hxx
X11SalGraphics::X11SalGraphics():
@@ -84,9 +82,7 @@ X11SalGraphics::X11SalGraphics():
bPrinter_(false),
bVirDev_(false)
{
-static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL();
-bool bUseOpenGL = bOpenGLPossible ?
officecfg::Office::Common::VCL::UseOpenGL::get() : false;
-if (bUseOpenGL)
+if (OpenGLHelper::isVCLOpenGLEnabled())
{
mpImpl.reset(new X11OpenGLSalGraphicsImpl(*this));
mpTextRenderImpl.reset((new OpenGLX11CairoTextRender(false, *this)));
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 4e3b76f..549a02f 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -589,9 +589,7 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType,
bool bScreen, HWND hW
mbFontKernInit(false),
mnPenWidth(GSL_PEN_WIDTH)
{
-static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL();
-bool bUseOpenGL = bOpenGLPossible mbWindow ?
officecfg::Office::Common::VCL::UseOpenGL::get() : false;
-if (bUseOpenGL)
+if (OpenGLHelper::isVCLOpenGLEnabled())
mpImpl.reset(new WinOpenGLSalGraphicsImpl(*this));
else
mpImpl.reset(new WinSalGraphicsImpl(*this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: new git bugzilla script
Hey, On Mon, Nov 10, 2014 at 5:28 PM, Stephan Bergmann sberg...@redhat.com wrote: On 10/27/2014 02:00 PM, Markus Mohrhard wrote: As it is a complete new implementation you should report any problems as soon as possible. Especially in the beta and the RC phase. I used the old script as a guideline but there are some special portions in it that can only be tested between the first beta and the last RC. https://bugs.freedesktop.org/show_bug.cgi?id=82038#c22 (mentioning 4.3.4) and preceding change that added target:4.3.4 to the bug's whiteboard are about a commit to libreoffice-4-3 done after branching off libreoffice-4-3-4, so should talk about 4.3.5 instead of 4.3.4. Should be fixed by http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=6af188d346447a92b8e41d68c7aea190521214a9 but of course I forgot to update the production copy. Should be done now. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/wrong.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ac0926092831f6968b703c5e999b105ccb0bb4b0
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 10 19:06:42 2014 +0100
Update nEndInvalid if it was COMPLETE_STRING
Change-Id: I850c9083230f44daa722e7f51dbfa73efd088d25
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index c82d05f..a9d500f 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -249,7 +249,7 @@ void SwWrongList::_Invalidate( sal_Int32 nBegin, sal_Int32
nEnd )
{
if ( nBegin GetBeginInv() )
nBeginInvalid = nBegin;
-if ( nEnd GetEndInv() )
+if ( nEnd GetEndInv() || GetEndInv() == COMPLETE_STRING )
nEndInvalid = nEnd;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 4 commits - vcl/inc vcl/opengl
vcl/inc/opengl/salbmp.hxx |2
vcl/inc/opengl/texture.hxx |3 +
vcl/inc/openglgdiimpl.hxx | 17 +-
vcl/opengl/gdiimpl.cxx | 127 -
vcl/opengl/salbmp.cxx | 15 +++--
vcl/opengl/texture.cxx | 10 +++
vcl/opengl/x11/gdiimpl.cxx |7 +-
7 files changed, 137 insertions(+), 44 deletions(-)
New commits:
commit cde6111a538b11e30112a727ea777b36664c4c82
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 13:46:12 2014 -0500
vcl: Use a different FBO when rendering using a VirtualDevice
Change-Id: I8cb97a4057c06ca09adfcac8dcd3f61ac9508430
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 6f7a03a..77ac90b 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -81,7 +81,7 @@ public:
public:
-boolCreate( OpenGLContext rContext, long nX, long nY, long
nWidth, long nHeight );
+boolCreate( OpenGLContext rContext, OpenGLTextureSharedPtr
pTex, long nX, long nY, long nWidth, long nHeight );
boolDraw( OpenGLContext rContext, const SalTwoRect rPosAry );
GLuint GetTexture( OpenGLContext rContext ) const;
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index f9d3ad8..c0b6541 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -39,6 +39,9 @@ public:
virtual ~OpenGLTexture();
GLuint Id() const;
+int GetWidth() const;
+int GetHeight() const;
+
void Bind();
void Unbind();
bool Draw();
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index cd1b7d4..5a11952 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -23,6 +23,8 @@
#include salgdiimpl.hxx
#include vcl/dllapi.h
+#include opengl/texture.hxx
+
#include vcl/opengl/OpenGLContext.hxx
class SalFrame;
@@ -36,6 +38,10 @@ protected:
SalFrame* mpFrame;
SalVirtualDevice* mpVDev;
+bool mbOffscreen;
+GLuint mnFramebufferId;
+OpenGLTextureSharedPtr mpOffscreenTex;
+
SalColor mnLineColor;
SalColor mnFillColor;
@@ -90,6 +96,9 @@ protected:
// operations to do after painting
virtual void PostDraw();
+// enable/disable offscreen rendering
+virtual void SetOffscreen( bool bOffscreen );
+
public:
virtual ~OpenGLSalGraphicsImpl ();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index dcc8af4..9a1b1d7 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -58,16 +58,21 @@ OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl()
void OpenGLSalGraphicsImpl::PreDraw()
{
maContext.makeCurrent();
+// TODO: lfrb: make sure the render target has the right size
+if( mbOffscreen )
+glBindFramebuffer( GL_FRAMEBUFFER, mnFramebufferId );
glViewport( 0, 0, GetWidth(), GetHeight() );
}
void OpenGLSalGraphicsImpl::PostDraw()
{
+if( mbOffscreen )
+glBindFramebuffer( GL_FRAMEBUFFER, 0 );
}
void OpenGLSalGraphicsImpl::freeResources()
{
-// Delete shaders, programs and textures if not shared
+// TODO Delete shaders, programs and textures if not shared
}
bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region rClip )
@@ -170,6 +175,38 @@ void OpenGLSalGraphicsImpl::SetROPFillColor( SalROPColor
/*nROPColor*/ )
{
}
+// enable/disbale offscreen rendering
+void OpenGLSalGraphicsImpl::SetOffscreen( bool bOffscreen )
+{
+if( bOffscreen == mbOffscreen )
+{
+// Already disabled
+if( !mbOffscreen )
+return;
+
+// Already enabled and same size
+if( mpOffscreenTex-GetWidth() == GetWidth()
+mpOffscreenTex-GetHeight() == GetHeight() )
+return;
+}
+else
+{
+mbOffscreen = bOffscreen;
+if( bOffscreen )
+glGenFramebuffers( 1, mnFramebufferId );
+else
+glDeleteFramebuffers( 1, mnFramebufferId );
+}
+
+if( mbOffscreen )
+{
+glBindFramebuffer( GL_FRAMEBUFFER, mnFramebufferId );
+mpOffscreenTex.reset( new OpenGLTexture( GetWidth(), GetHeight() ) );
+glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, mpOffscreenTex-Id(), 0 );
+CHECK_GL_ERROR();
+}
+}
+
bool OpenGLSalGraphicsImpl::CreateSolidProgram( void )
{
mnSolidProgram = OpenGLHelper::LoadShaders( solidVertexShader,
solidFragmentShader );
@@ -861,7 +898,7 @@ SalBitmap* OpenGLSalGraphicsImpl::getBitmap( long nX, long
nY, long nWidth, long
SAL_INFO( vcl.opengl, ::getBitmap nX , nY
nWidth x nHeight );
PreDraw();
-if( !pBitmap-Create( maContext, nX, nY, nWidth, nHeight ) )
+if( !pBitmap-Create( maContext, mpOffscreenTex, nX, nY, nWidth, nHeight )
)
{
delete pBitmap;
pBitmap = NULL;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 564426c..97dca8b 100644
--- a/vcl/opengl/salbmp.cxx
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit b64caa8ad85d951c74e1c84096802997340c8e1b Author: Michael Stahl mst...@redhat.com Date: Mon Nov 10 20:54:09 2014 +0100 Revert wrong merge conflict resolution, vcldemo, icontest go to instdir This reverts commit 726e1a49bd40d98ffcfba760a08c503b096c79bd. It is not desirable to put vcldemo and icontest into installation sets. diff --git a/Repository.mk b/Repository.mk index e62f632..3d3e35a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -68,6 +68,9 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svpclient \ pixelctl ) \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ + $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \ + outdevgrind) \ + vcldemo \ tiledrendering \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ )) @@ -147,9 +150,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(if $(filter WNT,$(OS)), \ senddoc \ ) \ - $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \ - outdevgrind) \ - vcldemo \ )) ifeq ($(OS),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24253481d0f3075cd7f3670e3ed7806d61094360 Author: Andras Timar andras.ti...@collabora.com Date: Mon Nov 10 12:19:16 2014 -0800 Bump version to 4.2-19 Change-Id: Ie02193db64ea94de1f1df6a2e2aa6d13ddbd72e2 diff --git a/configure.ac b/configure.ac index a9f0bfc..ed38062 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.18],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.19],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
some recent changes in build system / scp2
recently i've had some time to move more stuff out of scp2, which got rid of a fair bit of duplicated conditionals. on master, all libraries, executables and jars that are installed are now registered for their scp2 package in Repository.mk. this means that when you add something to one of the existing blocks there you need to check that it is the *correct* block, i.e., the second parameter of gb_Helper_register_*_for_install indicates the scp2 installation module that shall contain the file. consistency between the layer of libraries / executables / jars and whether or not they are installed is enforced by gbuild to avoid wrong usage. one benefit of this is that if the conditional about whether one of these is built and whether it is included in the installation sets are inconsistent, then the build will fail: if it is built but not registered then the build will detect that, if it is installed but not built then instsetoo_native will fail to build. this should reduce embarrassing bugs about un-packaged libraries like we've had in the past. there were a few executables in instdir that were not actually intended to be installed, and i've moved these to the NONE layer and the workdir/LinkTarget/Executable dir where they belong (instdir should contain exactly those build artifacts that are contained in installation sets; the rest goes in workdir). there is a new bin/run convenience script to run the programs out of workdir/LinkTarget/Executable; at the time when i did the change bin/run vcldemo would execute successfully on Linux - please add support for other platforms to the script when you need it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6df3d5e93a86a3ecb79cdb11e943e037d7648724
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Mon Nov 10 15:05:22 2014 +0100
remove pointless const_cast
Change-Id: I6026ab64f0cfe1d509c8f94ce3b9c6f700c823cf
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 12429be..5c78713 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -740,8 +740,8 @@ sal_Int32 FastSaxParserImpl::GetTokenWithContextNamespace(
sal_Int32 nNamespaceT
void FastSaxParserImpl::splitName( const XML_Char *pwName, const XML_Char
*rpPrefix, sal_Int32 rPrefixLen, const XML_Char *rpName, sal_Int32 rNameLen
)
{
-XML_Char *p;
-for( p = const_cast XML_Char* ( pwName ), rNameLen = 0, rPrefixLen = 0;
*p; p++ )
+const XML_Char *p;
+for( p = pwName, rNameLen = 0, rPrefixLen = 0; *p; p++ )
{
if( *p == ':' )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - 2 commits - sax/Library_expwrap.mk sax/source sw/qa
sax/Library_expwrap.mk|1 sax/source/fastparser/fastparser.cxx | 218 +- sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |1 3 files changed, 128 insertions(+), 92 deletions(-) New commits: commit 2d1a0e43667aceef736ed5c9684240594db34efd Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Mon Nov 10 21:24:36 2014 +0100 make sax_fastparser use libxml2 instead of expat (WIP) Not really finished but working (all unittests pass except for the one in sw which is probably rather writerfilter bug). Change-Id: If5c00aeaa39c50d3cdfa2965bec2d38cb494d19c diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index ef749a2..0c44d30 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_sdk_api,expwrap)) $(eval $(call gb_Library_use_externals,expwrap,\ boost_headers \ + libxml2 \ expat \ zlib \ )) diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 5c78713..99006ff 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -44,7 +44,10 @@ #include queue #include cassert #include cstring -#include expat.h +#include libxml/parser.h + +// TODO comment +#define XML_CAST( str ) reinterpret_cast const sal_Char* ( str ) using namespace ::std; using namespace ::osl; @@ -159,7 +162,7 @@ struct Entity : public ParserData // Allow to disable threading for small documents: boolmbEnableThreads; ::com::sun::star::xml::sax::InputSource maStructSource; -XML_Parser mpParser; +xmlParserCtxtPtrmpParser; ::sax_expatwrap::XMLFile2UTFConverter maConverter; // Exceptions cannot be thrown through the C-XmlParser (possible @@ -210,14 +213,14 @@ public: void setLocale( const ::com::sun::star::lang::Locale rLocale ) throw (::com::sun::star::uno::RuntimeException); // called by the C callbacks of the expat parser -void callbackStartElement( const XML_Char* name, const XML_Char** atts ); -void callbackEndElement( const XML_Char* name ); -void callbackCharacters( const XML_Char* s, int nLen ); -bool callbackExternalEntityRef( XML_Parser parser, const XML_Char *openEntityNames, const XML_Char *base, const XML_Char *systemId, const XML_Char *publicId); -void callbackEntityDecl(const XML_Char *entityName, int is_parameter_entity, -const XML_Char *value, int value_length, const XML_Char *base, -const XML_Char *systemId, const XML_Char *publicId, -const XML_Char *notationName); +void callbackStartElement( const xmlChar* name, const xmlChar** atts ); +void callbackEndElement( const xmlChar* name ); +void callbackCharacters( const xmlChar* s, int nLen ); +//bool callbackExternalEntityRef( XML_Parser parser, const xmlChar *openEntityNames, const xmlChar *base, const xmlChar *systemId, const xmlChar *publicId); +//void callbackEntityDecl(const xmlChar *entityName, int is_parameter_entity, +//const xmlChar *value, int value_length, const xmlChar *base, +//const xmlChar *systemId, const xmlChar *publicId, +//const xmlChar *notationName); void pushEntity( const Entity rEntity ); void popEntity(); @@ -232,15 +235,15 @@ private: bool consume(EventList *); void deleteUsedEvents(); -sal_Int32 GetToken( const sal_Char* pToken, sal_Int32 nTokenLen = 0 ); -sal_Int32 GetTokenWithPrefix( const sal_Char*pPrefix, int nPrefixLen, const sal_Char* pName, int nNameLen ) throw (::com::sun::star::xml::sax::SAXException); +sal_Int32 GetToken( const xmlChar* pToken, sal_Int32 nTokenLen = 0 ); +sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int nPrefixLen, const xmlChar* pName, int nNameLen ) throw (::com::sun::star::xml::sax::SAXException); OUString GetNamespaceURL( const OString rPrefix ) throw (::com::sun::star::xml::sax::SAXException); -OUString GetNamespaceURL( const sal_Char*pPrefix, int nPrefixLen ) throw (::com::sun::star::xml::sax::SAXException); +OUString GetNamespaceURL( const xmlChar* pPrefix, int nPrefixLen ) throw (::com::sun::star::xml::sax::SAXException); sal_Int32 GetNamespaceToken( const OUString rNamespaceURL ); -sal_Int32 GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const sal_Char* pName, int nNameLen ); -void DefineNamespace( const OString rPrefix, const sal_Char* pNamespaceURL ); +sal_Int32 GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const xmlChar* pName, int nNameLen ); +void DefineNamespace( const OString rPrefix, const xmlChar* pNamespaceURL ); -void splitName( const XML_Char *pwName, const XML_Char *rpPrefix, sal_Int32 rPrefixLen, const XML_Char *rpName, sal_Int32 rNameLen ); +void splitName( const xmlChar
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/pixmap.hxx |1 +
vcl/unx/generic/gdi/pixmap.cxx |6 +-
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cee950b53bc8e0e2d8d494376c9f1331f8ce8e45
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 10 20:32:49 2014 +
only call XFreePixmap on pixmaps created via XCreatePixmap
not on those belonging to gdk shoe-horned in via
mpPixmap = GDK_PIXMAP_XID( mpGdkPixmap );
in GdkX11Pixmap::GdkX11Pixmap
This stops file-new-presentation crashing on second invocation
Change-Id: Iec673497f900b0ddabd439369b9ffe554800d425
diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx
index 40bc11f..b65170f 100644
--- a/vcl/inc/unx/pixmap.hxx
+++ b/vcl/inc/unx/pixmap.hxx
@@ -36,6 +36,7 @@ protected:
Display*mpDisplay;
SalX11ScreenmnScreen;
Pixmap mpPixmap;
+boolmbDeletePixmap;
int mnWidth;
int mnHeight;
int mnDepth;
diff --git a/vcl/unx/generic/gdi/pixmap.cxx b/vcl/unx/generic/gdi/pixmap.cxx
index c30b9af..0440c46 100644
--- a/vcl/unx/generic/gdi/pixmap.cxx
+++ b/vcl/unx/generic/gdi/pixmap.cxx
@@ -13,6 +13,7 @@ X11Pixmap::X11Pixmap()
: mpDisplay( NULL )
, mnScreen( 0 )
, mpPixmap( 0 )
+, mbDeletePixmap( false )
, mnWidth( -1 )
, mnHeight( -1 )
, mnDepth( 0 )
@@ -22,6 +23,7 @@ X11Pixmap::X11Pixmap()
X11Pixmap::X11Pixmap( Display* pDisplay, SalX11Screen nScreen, int nWidth, int
nHeight, int nDepth )
: mpDisplay( pDisplay )
, mnScreen( nScreen )
+, mbDeletePixmap( true )
, mnWidth( nWidth )
, mnHeight( nHeight )
, mnDepth( nDepth )
@@ -33,17 +35,19 @@ X11Pixmap::X11Pixmap( Display* pDisplay, SalX11Screen
nScreen, int nWidth, int n
X11Pixmap::X11Pixmap( X11Pixmap rOther )
: mpDisplay( rOther.mpDisplay )
, mnScreen( rOther.mnScreen )
+, mbDeletePixmap( rOther.mbDeletePixmap )
, mnWidth( rOther.mnWidth )
, mnHeight( rOther.mnHeight )
, mnDepth( rOther.mnDepth )
{
mpPixmap = rOther.mpPixmap;
rOther.mpPixmap = 0;
+rOther.mbDeletePixmap = false;
}
X11Pixmap::~X11Pixmap()
{
-if( mpPixmap )
+if (mbDeletePixmap mpPixmap)
XFreePixmap( mpDisplay, mpPixmap );
}
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b8db643..0cf68fd 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -290,7 +290,7 @@ GdkX11Pixmap::GdkX11Pixmap( int nWidth, int nHeight, int
nDepth )
}
GdkX11Pixmap::GdkX11Pixmap( X11Pixmap rOther, GdkWindow *pWindow )
-: X11Pixmap( rOther )
+: X11Pixmap(rOther)
{
GdkColormap* pColormap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 4 commits - include/vcl vcl/opengl vcl/source vcl/workben
include/vcl/bitmapex.hxx|2 +
vcl/opengl/gdiimpl.cxx |4 +-
vcl/source/gdi/bitmapex.cxx | 17 +++--
vcl/workben/vcldemo.cxx | 79 +---
4 files changed, 71 insertions(+), 31 deletions(-)
New commits:
commit 3042512301fc4db1b90feddc116ec527eebfbfa0
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Nov 10 21:24:13 2014 +
vcl: opengl - alpha masks are unexpectedly inverted.
Change-Id: I5ebcd47e10df671bc60492bc80fc26a60f07306d
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 91f7789..e8ecf44 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -497,7 +497,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint
nTexture, GLuint nMask,
glBindTexture( GL_TEXTURE_2D, nMask );
glEnable( GL_BLEND );
-glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+glBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
DrawTextureRect( rSize, pPosAry );
glDisable( GL_BLEND );
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 1142e37..cd3e32e 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -27,7 +27,6 @@
#if 0
# define FIXME_SELF_INTERSECTING_WORKING
-# define FIXME_DRAW_BITMAPEX
#endif
using namespace css;
@@ -273,11 +272,7 @@ public:
for (size_t i = 0; i maIcons.size(); i++)
{
Size aSize(maIcons[i].GetSizePixel());
-#ifdef FIXME_DRAW_BITMAPEX
rDev.DrawBitmapEx(p.TopLeft(), maIcons[i]);
-#else
-rDev.DrawBitmap(p.TopLeft(), maIcons[i].GetBitmap());
-#endif
p.Move(aSize.Width(), 0);
if (p.Left() = r.Right())
break;
commit 668f0605e929a5a7d5d6f5d10fcda8547d29439b
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Nov 10 12:16:15 2014 +
vcldemo: load and render some icons
Change-Id: I4a4567d43e4c5c8a7ce7ba2764d2f9668fed291f
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index daa877f..1142e37 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -25,10 +25,9 @@
#include vcl/virdev.hxx
#include vcl/graphicfilter.hxx
-# define FIXME_ALPHA_WORKING
-# define FIXME_ROUNDED_RECT_WORKING
-# define FIXME_DRAW_TRANSPARENT_WORKING
#if 0
+# define FIXME_SELF_INTERSECTING_WORKING
+# define FIXME_DRAW_BITMAPEX
#endif
using namespace css;
@@ -99,7 +98,6 @@ public:
rDev.SetLineColor(Color(COL_BLACK));
rDev.DrawRect( r );
-// FIXME: notice these appear reflected at the bottom not the top.
for(int i=0; ir.GetHeight(); i+=15)
rDev.DrawLine( Point(r.Left(), r.Top()+i), Point(r.Right(),
r.Bottom()-i) );
for(int i=0; ir.GetWidth(); i+=15)
@@ -126,8 +124,7 @@ public:
rDev.DrawText( r, OUString( Just a simple text ) );
}
-void drawPoly(OutputDevice rDev, Rectangle r)
- // pretty
+void drawPoly(OutputDevice rDev, Rectangle r) // pretty
{
drawCheckered(rDev, r);
@@ -181,14 +178,10 @@ public:
BitmapEx aBitmap(maIntro);
aBitmap.Scale(r.GetSize(), BMP_SCALE_BESTQUALITY);
-#ifdef FIXME_ALPHA_WORKING
AlphaMask aSemiTransp(aBitmap.GetSizePixel());
aSemiTransp.Erase(64);
rDev.DrawBitmapEx(r.TopLeft(), BitmapEx(aBitmap.GetBitmap(),
- aSemiTransp));
-#else
-rDev.DrawBitmapEx(r.TopLeft(), aBitmap);
-#endif
+aSemiTransp));
}
void drawPolyPolgons(OutputDevice rDev, Rectangle r)
@@ -196,8 +189,13 @@ public:
struct {
double nX, nY;
} aPoints[] = { { 0.1, 0.1 }, { 0.9, 0.9 },
+#ifdef FIXME_SELF_INTERSECTING_WORKING
{ 0.9, 0.1 }, { 0.1, 0.9 },
{ 0.1, 0.1 } };
+#else
+{ 0.1, 0.9 }, { 0.5, 0.5 },
+{ 0.9, 0.1 }, { 0.1, 0.1 } };
+#endif
tools::PolyPolygon aPolyPoly;
// Render 4x polygons aggregate into another PolyPolygon
@@ -228,16 +226,12 @@ public:
}
rDev.SetLineColor(Color(COL_LIGHTRED));
rDev.SetFillColor(Color(COL_GREEN));
-#ifdef FIXME_DRAW_TRANSPARENT_WORKING
rDev.DrawTransparent(aPolyPoly, 50);
-#else
-rDev.DrawPolyPolygon(aPolyPoly);
-#endif
}
void drawToVirtualDevice(OutputDevice rDev, Rectangle r)
{
-VirtualDevice aNested;
-aNested.SetOutputSize(r.GetSize());
+VirtualDevice aNested(rDev);
+aNested.SetOutputSizePixel(r.GetSize());
Rectangle aWhole(Point(0,0), r.GetSize());
// mini me
drawToDevice(aNested, true);
@@ -246,9 +240,52 @@ public:
rDev.DrawBitmap(r.TopLeft(), aBitmap);
}
+std::vectorBitmapEx maIcons;
+void initIcons()
+{
+if (maIcons.size())
+return;
+
+const char *pNames[] = {
+
[Libreoffice-commits] core.git: vcl/opengl vcl/workben
vcl/opengl/gdiimpl.cxx |2 +-
vcl/workben/vcldemo.cxx |5 -
2 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 290943d20551a8504efe10f6f954aa16995bf95a
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Nov 10 21:24:13 2014 +
vcl: opengl - alpha masks are unexpectedly inverted.
Change-Id: I5ebcd47e10df671bc60492bc80fc26a60f07306d
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index ca5a975..11e7d55 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -450,7 +450,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint
nTexture, GLuint nMask,
glBindTexture( GL_TEXTURE_2D, nMask );
glEnable( GL_BLEND );
-glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+glBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
DrawTextureRect( rSize, pPosAry );
glDisable( GL_BLEND );
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 1142e37..cd3e32e 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -27,7 +27,6 @@
#if 0
# define FIXME_SELF_INTERSECTING_WORKING
-# define FIXME_DRAW_BITMAPEX
#endif
using namespace css;
@@ -273,11 +272,7 @@ public:
for (size_t i = 0; i maIcons.size(); i++)
{
Size aSize(maIcons[i].GetSizePixel());
-#ifdef FIXME_DRAW_BITMAPEX
rDev.DrawBitmapEx(p.TopLeft(), maIcons[i]);
-#else
-rDev.DrawBitmap(p.TopLeft(), maIcons[i].GetBitmap());
-#endif
p.Move(aSize.Width(), 0);
if (p.Left() = r.Right())
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - editeng/source
editeng/source/editeng/impedit3.cxx | 65 +---
1 file changed, 38 insertions(+), 27 deletions(-)
New commits:
commit e6674c479ee7bf60053a10792195af264ec17412
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Nov 10 16:49:58 2014 +0100
editeng: Avoid calling expensive getLineBreak() if possible
ImpEditEngine::ImpBreakLine: if nMinBreakPos == nMaxBreakPos just set
nBreakPos to the same value directly.
Change-Id: I4544cb6c56f68071cba739260161bb24ef5a3f7f
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index f68bc5c..bcbe8dc 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1769,45 +1769,56 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
break;
}
}
+assert(nMinBreakPos = nMaxBreakPos);
lang::Locale aLocale = GetLocale( EditPaM( pNode, nMaxBreakPos ) );
Reference i18n::XBreakIterator _xBI( ImplGetBreakIterator() );
-Reference XHyphenator xHyph;
-if ( bCanHyphenate )
-xHyph = GetHyphenator();
-i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence
PropertyValue (), 1 );
-i18n::LineBreakUserOptions aUserOptions;
-
-const i18n::ForbiddenCharacters* pForbidden =
GetForbiddenCharsTable()-GetForbiddenCharacters(
LanguageTag::convertToLanguageType( aLocale ), true );
-aUserOptions.forbiddenBeginCharacters = pForbidden-beginLine;
-aUserOptions.forbiddenEndCharacters = pForbidden-endLine;
-aUserOptions.applyForbiddenRules = static_castconst
SfxBoolItem(pNode-GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES
)).GetValue();
-aUserOptions.allowPunctuationOutsideMargin = static_castconst
SfxBoolItem(pNode-GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION
)).GetValue();
-aUserOptions.allowHyphenateEnglish = sal_False;
-
-i18n::LineBreakResults aLBR = _xBI-getLineBreak(
-pNode-GetString(), nMaxBreakPos, aLocale, nMinBreakPos,
aHyphOptions, aUserOptions );
-nBreakPos = aLBR.breakIndex;
-
-// BUG in I18N - under special condition (break behind field, #87327#)
breakIndex is nMinBreakPos
-if ( nBreakPos nMinBreakPos )
+const bool bAllowPunctuationOutsideMargin = static_castconst
SfxBoolItem(
+pNode-GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION
)).GetValue();
+
+if (nMinBreakPos == nMaxBreakPos)
{
nBreakPos = nMinBreakPos;
}
-else if ( ( nBreakPos nMaxBreakPos )
!aUserOptions.allowPunctuationOutsideMargin )
+else
{
-OSL_FAIL( I18N: XBreakIterator::getLineBreak returns position
Max );
-nBreakPos = nMaxBreakPos;
-}
+Reference XHyphenator xHyph;
+if ( bCanHyphenate )
+xHyph = GetHyphenator();
+i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence
PropertyValue (), 1 );
+i18n::LineBreakUserOptions aUserOptions;
+
+const i18n::ForbiddenCharacters* pForbidden =
GetForbiddenCharsTable()-GetForbiddenCharacters(
LanguageTag::convertToLanguageType( aLocale ), true );
+aUserOptions.forbiddenBeginCharacters = pForbidden-beginLine;
+aUserOptions.forbiddenEndCharacters = pForbidden-endLine;
+aUserOptions.applyForbiddenRules = static_castconst
SfxBoolItem(pNode-GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES
)).GetValue();
+aUserOptions.allowPunctuationOutsideMargin =
bAllowPunctuationOutsideMargin;
+aUserOptions.allowHyphenateEnglish = sal_False;
+
+i18n::LineBreakResults aLBR = _xBI-getLineBreak(
+pNode-GetString(), nMaxBreakPos, aLocale, nMinBreakPos,
aHyphOptions, aUserOptions );
+nBreakPos = aLBR.breakIndex;
+
+// BUG in I18N - under special condition (break behind field,
#87327#) breakIndex is nMinBreakPos
+if ( nBreakPos nMinBreakPos )
+{
+nBreakPos = nMinBreakPos;
+}
+else if ( ( nBreakPos nMaxBreakPos )
!aUserOptions.allowPunctuationOutsideMargin )
+{
+OSL_FAIL( I18N: XBreakIterator::getLineBreak returns position
Max );
+nBreakPos = nMaxBreakPos;
+}
-// nBreakPos can never be outside the portion, even not with hangig
punctuation
-if ( nBreakPos nMaxBreakPos )
-nBreakPos = nMaxBreakPos;
+// nBreakPos can never be outside the portion, even not with
hangig punctuation
+if ( nBreakPos nMaxBreakPos )
+nBreakPos = nMaxBreakPos;
+}
// BUG in I18N - the japanese dot is in the next line!
// !!!
Google shuts down the OpenID 2.0 on April 20, 2015
Just to inform you, that Google shuts down the OpenID 2.0 service on April 20, 2015, as explained in this announcement [1]. I know that some folks use it for Gerrit authentication. There are two pending issues in Gerrit's issue tracker [2], [3]. One tries to switch to LDAP (sucks for open source projects, obviously), another one to GitHub's OpenID. I never tried Yahoo!, though, but rumor has it that it sucks too. I think that the most promising alternative would be to set up OpenID service on TDF infrastructure. [1] https://developers.google.com/+/api/auth-migration#timetable [2] https://code.google.com/p/gerrit/issues/detail?id=2715 [3] https://code.google.com/p/gerrit/issues/detail?id=2677 David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dd8f3000f00c360ef3553ace6dc58b036e775e0d
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Nov 10 22:44:59 2014 +0100
Resolves fdo#86008: fix a crash when open doc file
This was the only block, in this part of the code, which wasn't checking
pSFlyPara-pFlyFmt
Change-Id: Id467dd601a24ba46391544a79d4eecaf5370812c
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4ecf0d5..c3a468b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2505,7 +2505,7 @@ void SwWW8ImplReader::StopApo()
// function, the extension of the SW-fly has to be set
// manually as the SW fly has no auto function to adjust the
// frame´s size.
-if( pSFlyPara-nNewNetWidth MINFLY )// BoxUpWidth ?
+if(pSFlyPara-nNewNetWidth MINFLY pSFlyPara-pFlyFmt)//
BoxUpWidth ?
{
long nW = pSFlyPara-nNewNetWidth;
nW += pSFlyPara-nWidth - pSFlyPara-nNetWidth; // Rand dazu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/qa
sw/qa/extras/ww8export/ww8export.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bc20268b0290cc1a3968121c12257c4be9fe3645
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Nov 10 23:01:28 2014 +0100
buildfix: sw ww8 export unit test
Change-Id: I011bea4f6da37e180446447dee1b79eee7bbd918
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index b4037ed..ef3b04e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -214,8 +214,6 @@ DECLARE_WW8EXPORT_TEST(testFdo59530, fdo59530.doc)
CPPUNIT_ASSERT_EQUAL(OUString(TextFieldEnd),
getPropertyOUString(xPropertySet, TextPortionType));
}
-#endif
-
DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
{
// Import / export of FFData.cch was missing.
@@ -225,6 +223,8 @@ DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
CPPUNIT_ASSERT_EQUAL(OUString(5),
xParameters-getByName(MaxLength).getOUString());
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* 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/opengl-vcl' - vcl/opengl
vcl/opengl/gdiimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d1bf54a0fe29d50972fc949ff01284a4414b5210
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 14:08:25 2014 -0500
vcl: Add rectangle outline rendering
Change-Id: I9debc8ad8316e6866ea0c28bd20eb61dd9dccf03
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index e8ecf44..900d361 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -586,8 +586,8 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY,
long nWidth, long nHeigh
{
const long nX1( nX );
const long nY1( nY );
-const long nX2( nX + nWidth - 1 );
-const long nY2( nY + nHeight - 1 );
+const long nX2( nX + nWidth );
+const long nY2( nY + nHeight );
const SalPoint aPoints[] = { { nX1, nY1 }, { nX2, nY1 },
{ nX2, nY2 }, { nX1, nY2 } };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/source
vcl/source/opengl/OpenGLContext.cxx | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 8ecbd12818db6e36df770e29cee217523561a3bd
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 17:13:55 2014 -0500
vcl: Use shared list for OpenGL contexts even with DBG_UTIL enabled
Change-Id: I296b3a38a362343ecf8d65aa005ecabc6858a682
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 1062a87..d39cb33 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -622,7 +622,13 @@ bool OpenGLContext::init(Display* dpy, Pixmap pix,
unsigned int width, unsigned
bool OpenGLContext::ImplInit()
{
+GLXContext pSharedCtx( NULL );
+
SAL_INFO(vcl.opengl, OpenGLContext::ImplInitstart);
+
+if( !vShareList.empty() )
+pSharedCtx = vShareList.front();
+
#ifdef DBG_UTIL
if (!mbPixmap glXCreateContextAttribsARB !mbRequestLegacyContext)
{
@@ -639,7 +645,7 @@ bool OpenGLContext::ImplInit()
GLX_CONTEXT_MINOR_VERSION_ARB, 2,
None
};
-m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], 0, GL_TRUE, nContextAttribs);
+m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], pSharedCtx, GL_TRUE, nContextAttribs);
SAL_INFO_IF(m_aGLWin.ctx, vcl.opengl, created a 3.2 core
context);
}
else
@@ -650,25 +656,22 @@ bool OpenGLContext::ImplInit()
if (!m_aGLWin.ctx)
{
-GLXContext pSharedCtx( NULL );
-
if (!m_aGLWin.dpy || !m_aGLWin.vi)
return false;
-if( !vShareList.empty() )
-pSharedCtx = vShareList.front();
-
m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy,
m_aGLWin.vi,
pSharedCtx,
GL_TRUE);
-
-if( m_aGLWin.ctx )
-vShareList.push_back( m_aGLWin.ctx );
}
-if( m_aGLWin.ctx == NULL )
+
+if( m_aGLWin.ctx )
+{
+vShareList.push_back( m_aGLWin.ctx );
+}
+else
{
SAL_WARN(vcl.opengl, unable to create GLX context);
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/opengl
vcl/opengl/gdiimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 01fad59c533d797cdb8dad1a848a553c4500115a
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 14:08:25 2014 -0500
vcl: Add rectangle outline rendering
Change-Id: I9debc8ad8316e6866ea0c28bd20eb61dd9dccf03
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 11e7d55..15f62e3 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -540,8 +540,8 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY,
long nWidth, long nHeigh
{
const long nX1( nX );
const long nY1( nY );
-const long nX2( nX + nWidth - 1 );
-const long nY2( nY + nHeight - 1 );
+const long nX2( nX + nWidth );
+const long nY2( nY + nHeight );
const SalPoint aPoints[] = { { nX1, nY1 }, { nX2, nY1 },
{ nX2, nY2 }, { nX1, nY2 } };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 6143fa5a89d9528fc11fed1e7fe96b9280d411a4
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 17:13:55 2014 -0500
vcl: Use shared list for OpenGL contexts even with DBG_UTIL enabled
Change-Id: I296b3a38a362343ecf8d65aa005ecabc6858a682
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 1062a87..d39cb33 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -622,7 +622,13 @@ bool OpenGLContext::init(Display* dpy, Pixmap pix,
unsigned int width, unsigned
bool OpenGLContext::ImplInit()
{
+GLXContext pSharedCtx( NULL );
+
SAL_INFO(vcl.opengl, OpenGLContext::ImplInitstart);
+
+if( !vShareList.empty() )
+pSharedCtx = vShareList.front();
+
#ifdef DBG_UTIL
if (!mbPixmap glXCreateContextAttribsARB !mbRequestLegacyContext)
{
@@ -639,7 +645,7 @@ bool OpenGLContext::ImplInit()
GLX_CONTEXT_MINOR_VERSION_ARB, 2,
None
};
-m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], 0, GL_TRUE, nContextAttribs);
+m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], pSharedCtx, GL_TRUE, nContextAttribs);
SAL_INFO_IF(m_aGLWin.ctx, vcl.opengl, created a 3.2 core
context);
}
else
@@ -650,25 +656,22 @@ bool OpenGLContext::ImplInit()
if (!m_aGLWin.ctx)
{
-GLXContext pSharedCtx( NULL );
-
if (!m_aGLWin.dpy || !m_aGLWin.vi)
return false;
-if( !vShareList.empty() )
-pSharedCtx = vShareList.front();
-
m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy,
m_aGLWin.vi,
pSharedCtx,
GL_TRUE);
-
-if( m_aGLWin.ctx )
-vShareList.push_back( m_aGLWin.ctx );
}
-if( m_aGLWin.ctx == NULL )
+
+if( m_aGLWin.ctx )
+{
+vShareList.push_back( m_aGLWin.ctx );
+}
+else
{
SAL_WARN(vcl.opengl, unable to create GLX context);
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: some recent changes in build system / scp2
Hi Michael, On Mon, Nov 10, 2014 at 09:19:43PM +0100, Michael Stahl wrote: this means that when you add something to one of the existing blocks there you need to check that it is the *correct* block, i.e., the second parameter of gb_Helper_register_*_for_install indicates the scp2 installation module that shall contain the file. thanks so much for completing this. Yet another case of duplicate registration less, and another move towards DRY hopefully ridding us from a wide set of needless painful, annoying and embarressing bugs. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 83174, which changed state. Bug 83174 Summary: PDF: CRASH when send email as PDF https://bugs.freedesktop.org/show_bug.cgi?id=83174 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/opengl vcl/workben
vcl/opengl/gdiimpl.cxx |2 +-
vcl/opengl/maskedTextureFragmentShader.glsl |2 +-
vcl/workben/vcldemo.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 46e8601878104c4c18944c78b29d4198d84775eb
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 17:54:52 2014 -0500
vcl: Fix the VirtualDevice rectangle rendering in vcldemo
Change-Id: I43d43d5e81d52560154b102cc469761b51a590d4
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index cd3e32e..16574d9 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -281,7 +281,7 @@ public:
void fetchDrawBitmap(OutputDevice rDev, Rectangle r)
{
-Bitmap aBitmap(GetBitmap(Point(0,0),rDev.GetOutputSizePixel()));
+Bitmap aBitmap(rDev.GetBitmap(Point(0,0),rDev.GetOutputSizePixel()));
aBitmap.Scale(r.GetSize(), BMP_SCALE_BESTQUALITY);
rDev.DrawBitmap(r.TopLeft(), aBitmap);
}
commit fea6a6bc3c995498caf8869a83eed3c97216f336
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 17:28:15 2014 -0500
vcl: Fix alpha value when drawing bitmap with mask
Change-Id: Ie9cbd754383296a9fe6e42346d4a17477eb88242
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 900d361..6413283 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -497,7 +497,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint
nTexture, GLuint nMask,
glBindTexture( GL_TEXTURE_2D, nMask );
glEnable( GL_BLEND );
-glBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
+glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
DrawTextureRect( rSize, pPosAry );
glDisable( GL_BLEND );
diff --git a/vcl/opengl/maskedTextureFragmentShader.glsl
b/vcl/opengl/maskedTextureFragmentShader.glsl
index badf91e..4d79ae9 100644
--- a/vcl/opengl/maskedTextureFragmentShader.glsl
+++ b/vcl/opengl/maskedTextureFragmentShader.glsl
@@ -17,7 +17,7 @@ void main() {
texel0 = texture2D(sampler, tex_coord);
texel1 = texture2D(mask, tex_coord);
gl_FragColor = texel0;
-gl_FragColor.a = texel1.r;
+gl_FragColor.a = 1.0 - texel1.r;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45789] automatic row height in reports
https://bugs.freedesktop.org/show_bug.cgi?id=45789 --- Comment #30 from Omar Syed osye...@gmail.com --- Don't worry guys. I got 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 38829] Add fractional inches to units
https://bugs.freedesktop.org/show_bug.cgi?id=38829 --- Comment #12 from Omar Syed osye...@gmail.com --- Is this bug still being worked on? I want to try give it a shot. I'm new to LibreOffice development but I also have two other people that will be working with me on it. If someone can help us out with some starting tips, that would be great. Thank you. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sax/source
sax/source/fastparser/fastparser.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7b902d605cb5336b6f66d33e42d34b13de413011
Author: László Németh nem...@collabora.com
Date: Tue Nov 11 02:10:14 2014 +0100
Windows build fix of make sax_fastparser use libxml2
Change-Id: I9d8d43010e098e5bf3414e4d3985b62601f97a03
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 99006ff..1e056d7 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -931,7 +931,7 @@ void FastSaxParserImpl::setEntityResolver(const Reference
XEntityResolver
maData.mxEntityResolver = Resolver;
}
-void FastSaxParserImpl::setLocale( const Locale Locale ) throw
(RuntimeException)
+void FastSaxParserImpl::setLocale( const lang::Locale Locale ) throw
(RuntimeException)
{
maData.maLocale = Locale;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - 2 commits - sc/inc sc/source
sc/inc/clipcontext.hxx | 53 +---
sc/inc/column.hxx |2
sc/source/core/data/clipcontext.cxx | 106 +++--
sc/source/core/data/column4.cxx |8 -
sc/source/core/data/document10.cxx | 223 +++-
sc/source/core/data/table7.cxx | 10 +
6 files changed, 264 insertions(+), 138 deletions(-)
New commits:
commit a49cb96244dd077d468bfd96d85a124fae135df5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Nov 10 18:45:21 2014 -0500
Speed up pasting of single row onto multiple destination rows.
This is an extension of the earlier paste optimization of a single cell
across multiple destination cells.
Change-Id: I3a60300d3d0e11420d997bea8f7f540e948f56cc
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 5f558cd..ccaca67 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -54,10 +54,12 @@ class CopyFromClipContext : public ClipContextBase
ScDocument* mpClipDoc;
InsertDeleteFlags mnInsertFlag;
InsertDeleteFlags mnDeleteFlag;
-ScCellValue maSingleCell;
+
+std::vectorScCellValue maSingleCells;
+std::vectorconst ScPatternAttr* maSinglePatterns;
+std::vectorconst ScPostIt* maSingleNotes;
+
ScConditionalFormatList* mpCondFormatList;
-const ScPatternAttr* mpSinglePattern;
-const ScPostIt* mpSingleNote;
bool mbAsLink:1;
bool mbSkipAttrForEmptyCells:1;
bool mbCloneNotes:1;
@@ -96,16 +98,23 @@ public:
void setDeleteFlag( InsertDeleteFlags nFlag );
InsertDeleteFlags getDeleteFlag() const;
-ScCellValue getSingleCell();
+/**
+ * Set the column size of a single cell row, which is used when copying
+ * a single row of cells in a clip doc and pasting it into multiple
+ * rows by replicating it.
+ */
+void setSingleCellColumnSize( size_t nSize );
-void setCondFormatList( ScConditionalFormatList* pCondFormatList );
-ScConditionalFormatList* getCondFormatList();
+ScCellValue getSingleCell( size_t nColOffset );
-const ScPatternAttr* getSingleCellPattern() const;
-void setSingleCellPattern( const ScPatternAttr* pAttr );
+const ScPatternAttr* getSingleCellPattern( size_t nColOffset ) const;
+void setSingleCellPattern( size_t nColOffset, const ScPatternAttr* pAttr );
-const ScPostIt* getSingleCellNote() const;
-void setSingleCellNote( const ScPostIt* pNote );
+const ScPostIt* getSingleCellNote( size_t nColOffset ) const;
+void setSingleCellNote( size_t nColOffset, const ScPostIt* pNote );
+
+void setCondFormatList( ScConditionalFormatList* pCondFormatList );
+ScConditionalFormatList* getCondFormatList();
void setTableProtected( bool b );
bool isTableProtected() const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ec05b13..d1ec1de 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -245,7 +245,7 @@ public:
bool InitBlockPosition( sc::ColumnBlockConstPosition rBlockPos ) const;
void DeleteBeforeCopyFromClip( sc::CopyFromClipContext rCxt, const
ScColumn rClipCol );
-void CopyOneCellFromClip( sc::CopyFromClipContext rCxt, SCROW nRow1,
SCROW nRow2 );
+void CopyOneCellFromClip( sc::CopyFromClipContext rCxt, SCROW nRow1,
SCROW nRow2, size_t nColOffset );
void CopyFromClip(
sc::CopyFromClipContext rCxt, SCROW nRow1, SCROW nRow2, long nDy,
ScColumn rColumn );
diff --git a/sc/source/core/data/clipcontext.cxx
b/sc/source/core/data/clipcontext.cxx
index d60a2e2..a414cfd4 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -36,7 +36,7 @@ CopyFromClipContext::CopyFromClipContext(ScDocument rDoc,
mnTabStart(-1), mnTabEnd(-1),
mpRefUndoDoc(pRefUndoDoc), mpClipDoc(pClipDoc),
mnInsertFlag(nInsertFlag), mnDeleteFlag(IDF_NONE),
-mpCondFormatList(NULL), mpSinglePattern(NULL), mpSingleNote(NULL),
+mpCondFormatList(NULL),
mbAsLink(bAsLink), mbSkipAttrForEmptyCells(bSkipAttrForEmptyCells),
mbCloneNotes (mnInsertFlag (IDF_NOTE|IDF_ADDNOTES)),
mbTableProtected(false)
@@ -106,39 +106,51 @@ InsertDeleteFlags CopyFromClipContext::getDeleteFlag()
const
return mnDeleteFlag;
}
-ScCellValue CopyFromClipContext::getSingleCell()
+void CopyFromClipContext::setSingleCellColumnSize( size_t nSize )
{
-return maSingleCell;
+maSingleCells.resize(nSize);
+maSinglePatterns.resize(nSize, NULL);
+maSingleNotes.resize(nSize, NULL);
}
-void CopyFromClipContext::setCondFormatList( ScConditionalFormatList*
pCondFormatList )
+ScCellValue CopyFromClipContext::getSingleCell( size_t nColOffset )
{
-mpCondFormatList = pCondFormatList;
+assert(nColOffset maSingleCells.size());
+return maSingleCells[nColOffset];
}
-ScConditionalFormatList* CopyFromClipContext::getCondFormatList()
+const ScPatternAttr* CopyFromClipContext::getSingleCellPattern( size_t
nColOffset ) const
{
-
[Libreoffice-commits] core.git: include/vcl
include/vcl/window.hxx | 54 - 1 file changed, 27 insertions(+), 27 deletions(-) New commits: commit b9efff1c738af14ae4ee89732e3bb09e515e7959 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Mon Nov 10 22:48:35 2014 +1100 vcl: tabify include/vcl/window.hxx Change-Id: I2c45b3b125b758dd391376bf731d8b91c00a0a5d Reviewed-on: https://gerrit.libreoffice.org/12337 Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com Tested-by: Chris Sherlock chris.sherloc...@gmail.com diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index ec51588..fc6bc06 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -510,7 +510,7 @@ protected: SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle rRect, long nHorzScroll, long nVertScroll, bool bChildren ); -SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; +SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; SAL_DLLPRIVATE void ImplInvalidate( const vcl::Region* rRegion, sal_uInt16 nFlags ); @@ -545,8 +545,8 @@ private: SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const; SAL_DLLPRIVATE void ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow ); -SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow(); -SAL_DLLPRIVATE const vcl::Window*ImplGetFirstOverlapWindow() const; +SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow(); +SAL_DLLPRIVATE const vcl::Window* ImplGetFirstOverlapWindow() const; SAL_DLLPRIVATE bool ImplIsRealParentPath( const vcl::Window* pWindow ) const; @@ -580,7 +580,7 @@ private: SAL_DLLPRIVATE void ImplInitWinClipRegion(); SAL_DLLPRIVATE void ImplInitWinChildClipRegion(); -SAL_DLLPRIVATE vcl::Region* ImplGetWinChildClipRegion(); +SAL_DLLPRIVATE vcl::Region* ImplGetWinChildClipRegion(); SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const vcl::Region rInterRegion, vcl::Region rRegion ); SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const vcl::Region rInterRegion, vcl::Region rRegion ); @@ -631,7 +631,7 @@ private: SAL_DLLPRIVATE bool ImplHasDlgCtrl(); SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ); -SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pWindow ); +SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pWindow ); SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, MapUnit eUnit ); SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, MapUnit eUnit ); @@ -651,7 +651,7 @@ private: // retrieves the list of owner draw decorated windows for this window hiearchy SAL_DLLPRIVATE ::std::vectorvcl::Window * ImplGetOwnerDrawList(); -SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); +SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); SAL_DLLPRIVATE RectangleImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; @@ -664,7 +664,7 @@ private: ImplGetCanvas( const Size rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; public: -virtual vcl::Region GetActiveClipRegion() const SAL_OVERRIDE; +virtual vcl::Region GetActiveClipRegion() const SAL_OVERRIDE; protected: // Single argument ctors shall be explicit. @@ -729,7 +729,7 @@ public: virtual voidDataChanged( const DataChangedEvent rDCEvt ); virtual boolPreNotify( NotifyEvent rNEvt ); virtual boolNotify( NotifyEvent rNEvt ); -virtual vcl::Window* GetPreferredKeyInputWindow(); +virtual vcl::Window*GetPreferredKeyInputWindow(); voidAddEventListener( const Link rEventListener ); voidRemoveEventListener( const Link rEventListener ); @@ -834,10 +834,10 @@ public: voidSetWindowRegionPixel(); voidSetWindowRegionPixel( const vcl::Region rRegion ); -const vcl::Region GetWindowRegionPixel() const; +const vcl::Region GetWindowRegionPixel() const; bool
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |2 --
include/vcl/window.hxx |4
vcl/source/outdev/outdev.cxx | 10 --
vcl/source/window/clipping.cxx |8
vcl/source/window/window.cxx |8
5 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit df2dbdc283a5af85e7250e4ba94ba8dfef96932b
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Mon Nov 10 23:12:52 2014 +1100
vcl: move OutputDevice::ImplGetFrameDev() to Window
ImplGetFrameDev() is for some unknown reason in OutputDevice, but it's
most definitely something that's specific to Window. I've moved this, and
also renamed it getFrameDev() as it's a private function.
Change-Id: Iffb2c439bee8c29ee585a0d50cfd6fbcfc28c3bc
Reviewed-on: https://gerrit.libreoffice.org/12338
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 80d8576..a977936 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -487,8 +487,6 @@ public:
private:
-SAL_DLLPRIVATE void ImplGetFrameDev ( const Point rPt, const
Point rDevPt, const Size rDevSize,
- OutputDevice rOutDev );
SAL_DLLPRIVATE void ImplDrawFrameDev( const Point rPt, const
Point rDevPt, const Size rDevSize,
const OutputDevice
rOutDev, const vcl::Region rRegion );
///@}
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index fc6bc06..2e072ba 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -533,10 +533,14 @@ protected:
SAL_DLLPRIVATE void PushPaintHelper(PaintHelper *pHelper);
SAL_DLLPRIVATE void PopPaintHelper(PaintHelper *pHelper);
+
private:
SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType );
+SAL_DLLPRIVATE void getFrameDev( const Point rPt, const
Point rDevPt, const Size rDevSize,
+ OutputDevice rOutDev
);
+
SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window*
pParent );
SAL_DLLPRIVATE void ImplInsertWindow( vcl::Window* pParent
);
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index ad7779d..e7ec624 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -398,16 +398,6 @@ bool OutputDevice::SupportsOperation( OutDevSupportType
eType ) const
// Frame public functions
-void OutputDevice::ImplGetFrameDev( const Point rPt, const Point rDevPt,
const Size rDevSize,
-OutputDevice rDev )
-{
-
-bool bOldMap = mbMap;
-mbMap = false;
-rDev.DrawOutDev( rDevPt, rDevSize, rPt, rDevSize, *this );
-mbMap = bOldMap;
-}
-
void OutputDevice::ImplDrawFrameDev( const Point rPt, const Point rDevPt,
const Size rDevSize,
const OutputDevice rOutDev, const
vcl::Region rRegion )
{
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index 42b2c92..d3e40d9 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -854,10 +854,10 @@ void Window::ImplSaveOverlapBackground()
mpWindowImpl-mpFrameData-mnAllSaveBackSize +=
nSaveBackSize;
Point aDevPt;
-OutputDevice *pOutDev =
mpWindowImpl-mpFrameWindow-GetOutDev();
-pOutDev-ImplGetFrameDev( Point( mnOutOffX, mnOutOffY ),
- aDevPt, aOutSize,
-
*(mpWindowImpl-mpOverlapData-mpSaveBackDev) );
+Window* pWin = mpWindowImpl-mpFrameWindow;
+pWin-getFrameDev( Point( mnOutOffX, mnOutOffY ),
+ aDevPt, aOutSize,
+
*(mpWindowImpl-mpOverlapData-mpSaveBackDev) );
mpWindowImpl-mpOverlapData-mpNextBackWin =
mpWindowImpl-mpFrameData-mpFirstBackWin;
mpWindowImpl-mpFrameData-mpFirstBackWin = this;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 3691241..737eeb9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1196,6 +1196,14 @@ void Window::ImplInitWindowData( WindowType nType )
mbEnableRTL = Application::GetSettings().GetLayoutRTL();
// true: this outdev will be mirrored if RTL window layout (UI mirroring) is
globally active
}
+void Window::getFrameDev( const Point rPt, const Point rDevPt, const Size
rDevSize, OutputDevice rDev )
+{
+bool bOldMap = mbMap;
+mbMap = false;
+rDev.DrawOutDev( rDevPt, rDevSize, rPt, rDevSize, *this );
+mbMap =
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |4 ++--
vcl/source/outdev/outdev.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b7c4c78a097f76314982d8c1a9f2e58df95080a1
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Mon Nov 10 23:16:44 2014 +1100
vcl: make ImplDrawOutDevDirect a protected function in OutputDevice
Also renamed it to drawOutDevDirect. We're making it protected because I'm
about to move ImplDrawFrameDev() from OutputDevice to Window, where it
should
be.
Change-Id: I7a94304cdc48b858c057749532de66086eeb5020
Reviewed-on: https://gerrit.libreoffice.org/12339
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a977936..c899017 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -518,9 +518,9 @@ protected:
virtual voidCopyDeviceArea( SalTwoRect aPosAry,
sal_uInt32 nFlags);
-private:
+SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice*
pSrcDev, SalTwoRect rPosAry );
-SAL_DLLPRIVATE void ImplDrawOutDevDirect ( const OutputDevice*
pSrcDev, SalTwoRect rPosAry );
+private:
// not implemented; to detect misuses of DrawOutDev(...OutputDevice);
SAL_DLLPRIVATE void DrawOutDev( const Point, const Size, const
Point, const Size, const Printer) SAL_DELETED_FUNCTION;
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index e7ec624..0e11f17 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -433,7 +433,7 @@ void OutputDevice::ImplDrawFrameDev( const Point rPt,
const Point rDevPt, cons
aPosAry.mnDestY = rPt.Y();
aPosAry.mnDestWidth = rDevSize.Width();
aPosAry.mnDestHeight = rDevSize.Height();
-ImplDrawOutDevDirect( rOutDev, aPosAry );
+drawOutDevDirect( rOutDev, aPosAry );
// Ensure that ClipRegion is recalculated and set
mbInitClipRegion = true;
@@ -553,7 +553,7 @@ void OutputDevice::DrawOutDev( const Point rDestPt, const
Size rDestSize,
}
else
{
-ImplDrawOutDevDirect( rOutDev, aPosAry );
+drawOutDevDirect( rOutDev, aPosAry );
// #i32109#: make destination rectangle opaque - source has no
alpha
mpAlphaVDev-ImplFillOpaqueRectangle( Rectangle(rDestPt,
rDestSize) );
@@ -569,7 +569,7 @@ void OutputDevice::DrawOutDev( const Point rDestPt, const
Size rDestSize,
else
{
// no alpha at all, neither in source nor destination device
-ImplDrawOutDevDirect( rOutDev, aPosAry );
+drawOutDevDirect( rOutDev, aPosAry );
}
}
}
@@ -638,7 +638,7 @@ void OutputDevice::CopyDeviceArea( SalTwoRect aPosAry,
sal_uInt32 /*nFlags*/)
// Direct OutputDevice drawing private function
-void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev,
SalTwoRect rPosAry )
+void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect
rPosAry )
{
SalGraphics*pGraphics2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - 2 commits - sc/inc sc/source
sc/inc/clipcontext.hxx |2
sc/source/core/data/clipcontext.cxx | 126
sc/source/core/data/document10.cxx | 118 -
3 files changed, 129 insertions(+), 117 deletions(-)
New commits:
commit 5ac3ade190258b62e0ab05e8befebfa083fb5651
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Nov 10 21:27:16 2014 -0500
Scope reduction.
Change-Id: Ic0cb74d220dccdcb4f607f4883b9b7fdf86bb080
diff --git a/sc/source/core/data/clipcontext.cxx
b/sc/source/core/data/clipcontext.cxx
index 85c079c..5fd08da 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -126,9 +126,9 @@ ScCellValue CopyFromClipContext::getSingleCell( size_t
nColOffset )
void CopyFromClipContext::setSingleCell( const ScAddress rSrcPos, const
ScColumn rSrcCol )
{
SCCOL nColOffset = rSrcPos.Col() -
mpClipDoc-GetClipParam().getWholeRange().aStart.Col();
-
ScCellValue rSrcCell = getSingleCell(nColOffset);
-if (isAsLink())
+
+if (mbAsLink)
{
ScSingleRefData aRef;
aRef.InitAddress(rSrcPos);
@@ -137,112 +137,111 @@ void CopyFromClipContext::setSingleCell( const
ScAddress rSrcPos, const ScColum
ScTokenArray aArr;
aArr.AddSingleReference(aRef);
rSrcCell.set(new ScFormulaCell(mpClipDoc, rSrcPos, aArr));
+return;
}
-else
+
+rSrcCell.assign(*mpClipDoc, rSrcPos);
+
+// Check the paste flag to see whether we want to paste this cell. If the
+// flag says we don't want to paste this cell, we'll return with true.
+InsertDeleteFlags nFlags = getInsertFlag();
+bool bNumeric = (nFlags IDF_VALUE) != IDF_NONE;
+bool bDateTime = (nFlags IDF_DATETIME) != IDF_NONE;
+bool bString = (nFlags IDF_STRING) != IDF_NONE;
+bool bBoolean = (nFlags IDF_SPECIAL_BOOLEAN) != IDF_NONE;
+bool bFormula = (nFlags IDF_FORMULA) != IDF_NONE;
+
+switch (rSrcCell.meType)
{
-rSrcCell.assign(*mpClipDoc, rSrcPos);
-
-// Check the paste flag to see whether we want to paste this cell. If
the
-// flag says we don't want to paste this cell, we'll return with true.
-InsertDeleteFlags nFlags = getInsertFlag();
-bool bNumeric = (nFlags IDF_VALUE) != IDF_NONE;
-bool bDateTime = (nFlags IDF_DATETIME) != IDF_NONE;
-bool bString = (nFlags IDF_STRING) != IDF_NONE;
-bool bBoolean = (nFlags IDF_SPECIAL_BOOLEAN) != IDF_NONE;
-bool bFormula = (nFlags IDF_FORMULA) != IDF_NONE;
-
-switch (rSrcCell.meType)
+case CELLTYPE_VALUE:
+{
+bool bPaste = isDateCell(rSrcCol, rSrcPos.Row()) ? bDateTime :
bNumeric;
+if (!bPaste)
+// Don't paste this.
+rSrcCell.clear();
+}
+break;
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+{
+if (!bString)
+// Skip pasting.
+rSrcCell.clear();
+}
+break;
+case CELLTYPE_FORMULA:
{
-case CELLTYPE_VALUE:
+if (bBoolean)
{
-bool bPaste = isDateCell(rSrcCol, rSrcPos.Row()) ? bDateTime :
bNumeric;
-if (!bPaste)
-// Don't paste this.
-rSrcCell.clear();
+// Check if this formula cell is a boolean cell, and if so, go
ahead and paste it.
+ScTokenArray* pCode = rSrcCell.mpFormula-GetCode();
+if (pCode pCode-GetLen() == 1)
+{
+const formula::FormulaToken* p = pCode-First();
+if (p-GetOpCode() == ocTrue || p-GetOpCode() == ocFalse)
+// This is a boolean formula. Good.
+break;
+}
}
-break;
-case CELLTYPE_STRING:
-case CELLTYPE_EDIT:
+
+if (bFormula)
+// Good.
+break;
+
+sal_uInt16 nErr = rSrcCell.mpFormula-GetErrCode();
+if (nErr)
{
-if (!bString)
-// Skip pasting.
+// error codes are cloned with values
+if (!bNumeric)
+// Error code is treated as numeric value. Don't paste it.
rSrcCell.clear();
}
-break;
-case CELLTYPE_FORMULA:
+else if (rSrcCell.mpFormula-IsValue())
{
-if (bBoolean)
+bool bPaste = isDateCell(rSrcCol, rSrcPos.Row()) ? bDateTime :
bNumeric;
+if (!bPaste)
{
-// Check if this formula cell is a boolean cell, and if
so, go ahead and paste it.
-ScTokenArray* pCode = rSrcCell.mpFormula-GetCode();
-if (pCode pCode-GetLen() == 1)
-
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/inc vcl/opengl vcl/unx
vcl/inc/openglgdiimpl.hxx|5 ++
vcl/inc/salgdiimpl.hxx |5 ++
vcl/inc/unx/salgdi.h |4 +
vcl/opengl/gdiimpl.cxx | 17 +++
vcl/unx/generic/gdi/gdiimpl.cxx |6 ++
vcl/unx/generic/gdi/gdiimpl.hxx |4 +
vcl/unx/generic/gdi/openglx11cairotextrender.cxx | 53 +++
vcl/unx/generic/gdi/salgdi2.cxx |6 ++
8 files changed, 91 insertions(+), 9 deletions(-)
New commits:
commit 6fad1cfc18b084ac2974fc07c81208b1d4ab631a
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Mon Nov 10 23:30:02 2014 -0500
vcl: Fix text rendering with OpenGL
Change-Id: I7784fa81cb6f9a3d6437b2b628c37e7895c84733
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 5a11952..56938b9 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -242,6 +242,11 @@ public:
const SalBitmap rSourceBitmap,
const SalBitmap rAlphaBitmap ) SAL_OVERRIDE;
+/** Render 32-bits bitmap with alpha channel */
+virtual bool drawAlphaBitmap(
+const SalTwoRect,
+const SalBitmap rBitmap ) SAL_OVERRIDE;
+
/** draw transformed bitmap (maybe with alpha) where Null, X, Y define the
coordinate system */
virtual bool drawTransformedBitmap(
const basegfx::B2DPoint rNull,
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index 5d49952..4b4b735 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -181,6 +181,11 @@ public:
const SalBitmap rSourceBitmap,
const SalBitmap rAlphaBitmap ) = 0;
+/** Render 32-bits bitmap with alpha channel */
+virtual bool drawAlphaBitmap(
+const SalTwoRect,
+const SalBitmap rBitmap ) = 0;
+
/** draw transformed bitmap (maybe with alpha) where Null, X, Y define the
coordinate system */
virtual bool drawTransformedBitmap(
const basegfx::B2DPoint rNull,
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index c288292..d532668 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -252,6 +252,10 @@ public:
virtual booldrawAlphaBitmap( const SalTwoRect,
const SalBitmap rSourceBitmap,
const SalBitmap rAlphaBitmap )
SAL_OVERRIDE;
+
+virtual booldrawAlphaBitmap( const SalTwoRect,
+ const SalBitmap rBitmap );
+
virtual bool drawTransformedBitmap(
const basegfx::B2DPoint rNull,
const basegfx::B2DPoint rX,
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 6413283..8c06769 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1007,6 +1007,23 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
return true;
}
+bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
+const SalTwoRect rPosAry,
+const SalBitmap rSalBitmap )
+{
+const OpenGLSalBitmap rBitmap = static_castconst
OpenGLSalBitmap(rSalBitmap);
+const GLuint nTexture( rBitmap.GetTexture( maContext ) );
+
+SAL_INFO( vcl.opengl, ::drawAlphaBitmap );
+PreDraw();
+glEnable( GL_BLEND );
+glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+DrawTexture( nTexture, rBitmap.GetSize(), rPosAry );
+glDisable( GL_BLEND );
+PostDraw();
+return true;
+}
+
/** draw transformed bitmap (maybe with alpha) where Null, X, Y define the
coordinate system */
bool OpenGLSalGraphicsImpl::drawTransformedBitmap(
const basegfx::B2DPoint /*rNull*/,
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 172ebd6..0f210b3 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -955,6 +955,12 @@ bool X11SalGraphicsImpl::drawAlphaBitmap( const
SalTwoRect rTR,
return true;
}
+bool X11SalGraphicsImpl::drawAlphaBitmap( const SalTwoRect /*rTR*/,
+const SalBitmap /*rBitmap*/ )
+{
+return false;
+}
+
bool X11SalGraphicsImpl::drawTransformedBitmap(
const basegfx::B2DPoint rNull,
const basegfx::B2DPoint rX,
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 252fe35..e6bfa86 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -242,6 +242,10 @@ public:
const SalBitmap rSourceBitmap,
const SalBitmap rAlphaBitmap ) SAL_OVERRIDE;
+virtual bool drawAlphaBitmap(
+const SalTwoRect,
+const SalBitmap rBitmap ) SAL_OVERRIDE;
+
/** draw transformed bitmap (maybe with alpha) where Null, X, Y define the
coordinate system */
virtual bool drawTransformedBitmap(
const basegfx::B2DPoint rNull,
diff --git
LibreOffice Gerrit News for core on 2014-11-11
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Standardizing the draw standard toolbar with other app standard toolbars in https://gerrit.libreoffice.org/12360 from Yousuf Philips about module sd + fdo#84909 adding and hiding buttons in standard and common task toolbars in https://gerrit.libreoffice.org/12359 from Yousuf Philips about module sd + TANGO: copy filter icons from human and add new row and column icons in https://gerrit.libreoffice.org/12358 from Yousuf Philips about module icon-themes + TANGO: Addition of sort icon and update of symbol and page break in https://gerrit.libreoffice.org/12354 from Yousuf Philips about module icon-themes, officecfg + fdo#80403: TokenHandler impl. FastTokenHandlerBase in https://gerrit.libreoffice.org/12335 from Daniel Sikeler about module editeng, solenv + fdo#85594 enabling sort, autofilter, alignment buttons and hiding others in https://gerrit.libreoffice.org/12353 from Yousuf Philips about module sc + Fix common typos. No automatic tools. Handmade… in https://gerrit.libreoffice.org/12164 from Andrea Gelmini about module android, avmedia, basctl, basic, bin, bridges, build, canvas, chart2, cli_ure, comphelper, compilerplugins, connectivity, cppuhelper, crashrep, dbaccess, desktop, editeng, embeddedobj, embedserv, eventattacher, extensions, external, filter, forms, fpicker, framework, hwpfilter, i18nlangtag, i18npool, include, instsetoo_native, javaunohelper, jurt, jvmfwk, linguistic, lotuswordpro, odk, offapi, officecfg, oox, package, pyuno, qadevOOo, readlicense_oo, registry, reportbuilder, reportdesign, ridljar, sal, sc, scaddins, scp2, scripting, sd, setup_native, sfx2, shell, slideshow, solenv, sot, starmath, stoc, svl, svtools, svx, sw, test, toolkit, tools, tubes, ucb, ucbhelper, udkapi, unodevtools, unotools, uui, vcl, winaccessibility, wizards, writerfilter, xmerge, xmlhelp, xmloff, xmlsecurity + fdo#85046 removing extra merge document entry in the Tools menu in https://gerrit.libreoffice.org/12331 from Yousuf Philips about module sc + fdo#85912 Delete surrounding text failing for input method calls regressi in https://gerrit.libreoffice.org/12311 from Justin Luth about module sw End of freshness + vcl: fdo#39468 - remove useless German comment in https://gerrit.libreoffice.org/12341 from Chris Sherlock about module vcl + add 'make etags' to generate etags in https://gerrit.libreoffice.org/12300 from Takeshi Abe about module build, solenv + vcl: move OutputDevice::ImplDrawFrameDev() to Window in https://gerrit.libreoffice.org/12340 from Chris Sherlock about module include, vcl + fdo#75256 Update sifr icontheme in https://gerrit.libreoffice.org/12357 from Matthias Freund about module icon-themes + Partialy rewriter basic scanner by using more rtl/character.hxx . in https://gerrit.libreoffice.org/11979 from Arnaud Versini about module basic, include + iwyu: remove unneeded includes in sc, sd, sw in https://gerrit.libreoffice.org/12342 from Riccardo Magliocchetti about module sc, sd, sw + fdo#76658 fix bad conversion of old-style UNO service.. in https://gerrit.libreoffice.org/12332 from Noel Grandin about module cui, framework, offapi + fdo#85907 Tweak size requests in https://gerrit.libreoffice.org/12334 from Adolfo Jayme Barrientos about module cui + fdo#84938: replace HELPMODE_ constants with enum in https://gerrit.libreoffice.org/12333 from Noel Grandin about module basctl, chart2, cui, dbaccess, include, reportdesign, sc, sd, sfx2, svtools, svx, sw, vcl * Merged changes on master for project core changed in the last 25 hours: + vcl: move OutputDevice::ImplGetFrameDev() to Window in https://gerrit.libreoffice.org/12338 from Chris Sherlock + vcl: make ImplDrawOutDevDirect a protected function in OutputDevice in https://gerrit.libreoffice.org/12339 from Chris Sherlock + vcl: tabify include/vcl/window.hxx in https://gerrit.libreoffice.org/12337 from Chris Sherlock + CJK Numbered list test cases for ooxmlimport and ww8import. in https://gerrit.libreoffice.org/12319 from Mark Hung + sw: disable failing cp test on headless build in https://gerrit.libreoffice.org/12301 from Riccardo Magliocchetti + never wonder if sun is not sun in https://gerrit.libreoffice.org/12330 from Takeshi Abe * Abandoned changes on master for project core changed in the last 25 hours: + sw: uibase: remove unneeded includes pointed out by iwyu in https://gerrit.libreoffice.org/12291 from Riccardo Magliocchetti + HIG fixes for sfx2 in https://gerrit.libreoffice.org/12321 from Adolfo Jayme Barrientos + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde * Open changes needing tweaks, but being untouched for more than a week: + fdo#83308 Show thousand separators in document word/character counts in
[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source include/vcl reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/source
basctl/source/basicide/baside2b.cxx |4 +-
chart2/source/controller/main/ChartWindow.cxx |2 -
cui/source/options/optinet2.cxx |2 -
dbaccess/source/ui/control/dbtreelistbox.cxx|2 -
dbaccess/source/ui/control/opendoccontrols.cxx |2 -
dbaccess/source/ui/querydesign/TableWindowTitle.cxx |2 -
include/vcl/event.hxx | 35
reportdesign/source/ui/report/StartMarker.cxx |2 -
sc/source/ui/navipi/content.cxx |2 -
sc/source/ui/view/gridwin5.cxx |6 +--
sd/source/ui/view/viewshe2.cxx |2 -
sfx2/source/dialog/dinfdlg.cxx |2 -
svtools/source/contnr/imivctl1.cxx |2 -
svtools/source/contnr/svimpbox.cxx |2 -
svtools/source/control/calendar.cxx |4 +-
svtools/source/control/headbar.cxx |8 ++--
svtools/source/control/tabbar.cxx |8 ++--
svtools/source/control/valueset.cxx |2 -
svtools/source/table/tabledatawindow.cxx|6 +--
svtools/source/toolpanel/paneltabbar.cxx|2 -
svx/source/fmcomp/fmgridcl.cxx |4 +-
svx/source/form/fmpage.cxx |2 -
sw/source/core/draw/dpage.cxx |4 +-
sw/source/ui/fldui/FldRefTreeListBox.cxx|2 -
sw/source/ui/index/cnttab.cxx |4 +-
sw/source/uibase/docvw/edtwin2.cxx |4 +-
sw/source/uibase/utlui/content.cxx |2 -
sw/source/uibase/utlui/glbltree.cxx |2 -
vcl/source/app/dbggui.cxx |2 -
vcl/source/control/button.cxx |2 -
vcl/source/control/tabctrl.cxx | 10 ++---
vcl/source/window/brdwin.cxx|4 +-
vcl/source/window/menubarwindow.cxx |2 -
vcl/source/window/menufloatingwindow.cxx|2 -
vcl/source/window/menuwindow.cxx|6 +--
vcl/source/window/splitwin.cxx |4 +-
vcl/source/window/status.cxx|6 +--
vcl/source/window/toolbox.cxx |6 +--
vcl/source/window/window.cxx|4 +-
vcl/source/window/winproc.cxx | 12 +++---
40 files changed, 94 insertions(+), 87 deletions(-)
New commits:
commit a52f29216d2a70ea4a0a0347d71273cdbf8830e3
Author: Noel Grandin n...@peralex.com
Date: Mon Nov 10 13:34:35 2014 +0200
fdo#84938: replace HELPMODE_ constants with enum
Change-Id: I44be5567e84cdabd8b10771ea37e28b8a88cc23e
Reviewed-on: https://gerrit.libreoffice.org/12333
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 134a5c0..f8fb47f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -335,13 +335,13 @@ void EditorWindow::RequestHelp( const HelpEvent rHEvt )
// Should have been activated at some point
if ( pEditEngine )
{
-if ( rHEvt.GetMode() HELPMODE_CONTEXT )
+if ( rHEvt.GetMode() HelpEventMode::CONTEXT )
{
OUString aKeyword = GetWordAtCursor();
Application::GetHelp()-SearchKeyword( aKeyword );
bDone = true;
}
-else if ( rHEvt.GetMode() HELPMODE_QUICK )
+else if ( rHEvt.GetMode() HelpEventMode::QUICK )
{
OUString aHelpText;
Point aTopLeft;
diff --git a/chart2/source/controller/main/ChartWindow.cxx
b/chart2/source/controller/main/ChartWindow.cxx
index d54441b..a0c9784 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -227,7 +227,7 @@ void ChartWindow::DataChanged( const DataChangedEvent
rDCEvt )
void ChartWindow::RequestHelp( const HelpEvent rHEvt )
{
bool bHelpHandled = false;
-if( ( rHEvt.GetMode() HELPMODE_QUICK )
+if( ( rHEvt.GetMode() HelpEventMode::QUICK )
m_pWindowController )
{
// Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); //
old chart: GetPointerPosPixel()
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 49e6ff0..d1b3b5c 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -562,7 +562,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent
rHEvt )
aPt = OutputToScreenPixel( aItemRect.BottomRight() );
aItemRect.Right() = aPt.X();
aItemRect.Bottom() = aPt.Y();
-if( rHEvt.GetMode() == HELPMODE_BALLOON )
+if( rHEvt.GetMode() == HelpEventMode::BALLOON )
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #7 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a52f29216d2a70ea4a0a0347d71273cdbf8830e3 fdo#84938: replace HELPMODE_ constants with enum It will be available in 4.4.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
Re: Google shuts down the OpenID 2.0 on April 20, 2015
Bah. Why not use Facebook? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Google shuts down the OpenID 2.0 on April 20, 2015
Hi, What about to use Persona? It also integrates to Bugzilla to. Both are Mozilla related stuff. Üdvözlettel / Best Regards: Kálmán (KAMI) Szalai 2014-11-11 7:26 GMT+01:00 Tor Lillqvist t...@iki.fi: Bah. Why not use Facebook? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Google shuts down the OpenID 2.0 on April 20, 2015
On Tue, 2014-11-11 at 08:26 +0200, Tor Lillqvist wrote: Bah. Why not use Facebook? I don't have FB account. David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: some recent changes in build system / scp2
at the time when i did the change bin/run vcldemo would execute successfully on Linux - please add support for other platforms to the script when you need it. In other words, I broke stuff for people on all platforms except my pet one, fix it yourself. Good to know that this is acceptable standard procedure around here. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/shared/vtablefactory.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 269b0b40814defe0241e8c79c1834e488ea13bc5 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 11 08:28:52 2014 +0100 Avoid -fsanitize=signed-integer-overflow Change-Id: Icec67e6eb57605102cabf494d3e2bb6249d785c7 diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 2daf76b..2af1b62 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -348,7 +348,7 @@ sal_Int32 VtableFactory::createVtables( code = addLocalFunctions( slots, code, #ifdef USE_DOUBLE_MMAP -sal_IntPtr(block.exec) - sal_IntPtr(block.start), +sal_uIntPtr(block.exec) - sal_uIntPtr(block.start), #endif type2, baseOffset.getFunctionOffset(type2-aBase.pTypeName), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Google shuts down the OpenID 2.0 on April 20, 2015
I don't have FB account. Yeah, they are notoriously hard to get. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] Annual Report: fill it! :)
Hi all, The end of the year will be soon here and Flo will have to write the annual report for the Berlin authorities. But we also want to have data for a marketing brochure (not only for the product but also for the community) in English. Please fill the pad with your team achievements! We want to know what happened this year :) http://pad.documentfoundation.org/p/annualreport We need data from the Design, QA, Infra, NLPs and DLP projects. Thanks a lot in advance. Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Co-founder - Release coordinator The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Migration of dev-downloads to new infrastructure - Planned DOWNTIME
Hi, the dev-downloads VM will be migrated to our new infrastructure on Tuesday, 11 November, thefore there will be a downtime starting at about 0900UTC and ending around 2300UTC. Thanks, Alex -- Alexander Werner a...@documentfoundation.org Admin Team of The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 Berlin Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Message signed with OpenPGP using GPGMail ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
