Re: suggestion for adding sdk/lib to pluginapp.bin or libuno_sal.so symlink in ure/lib
Le 21/05/14 10:56, Stephan Bergmann a écrit : On 05/21/2014 07:13 AM, Richard PALO wrote: S=/var/tmp/pkgsrc/misc/libreoffice4/work/libreoffice-4.2.4.2 && I=$S/instdir && W=$S/workdir && g++-Wl,-z,origin '-Wl,-rpath,$ORIGIN:$ORIGIN/../ure-link/lib' -L$I/ure/lib -L$I/program -z nodefs $W/CxxObject/extensions/source/plugin/unx/npwrap.o $W/CxxObject/extensions/source/plugin/unx/npnapi.o -Wl,--start-group $W/LinkTarget/StaticLibrary/libplugcon.a -lm -lnsl -lsocket -lXt -lXext -lX11 -ldl -L/opt/local/lib -Wl,-R/opt/local/lib -lgthread-2.0 -lpthread -lthread -Wl,-R/opt/local/lib -lglib-2.0 -lintl -L/opt/local/lib -Wl,-R/opt/local/lib -lgtk-x11-2.0 -Wl,-R/opt/local/lib -lgdk-x11-2.0 -Wl,-R/opt/local/lib -lpangocairo-1.0 -Wl,-R/opt/local/lib -latk-1.0 -Wl,-R/opt/local/lib -lcairo -Wl,-R/opt/local/lib -lgio-2.0 -Wl,-R/opt/local/lib -lpangoft2-1.0 -Wl,-R/opt/local/lib -lpango-1.0 -Wl,-R/opt/local/lib -lfontconfig -Wl,-R/opt/local/lib -lfreetype -Wl,-R/opt/local/lib -lgdk_pixbuf_xlib-2.0 -Wl,-R/opt/local/lib -lgmodule-2.0 -lpthread -lthread -Wl,-R/opt/local/lib -lgdk_pixbuf-2.0 -Wl,-R/opt/local/lib -lgobject-2.0 -Wl,-R/opt/local/lib -lglib-2.0 -lintl -L/opt/local/lib -Wl,-R/opt/local/lib -lgtk-x11-2.0 -Wl,-R/opt/local/lib -lgdk-x11-2.0 -Wl,-R/opt/local/lib -lpangocairo-1.0 -Wl,-R/opt/local/lib -latk-1.0 -Wl,-R/opt/local/lib -lcairo -Wl,-R/opt/local/lib -lgdk_pixbuf-2.0 -Wl,-R/opt/local/lib -lgio-2.0 -Wl,-R/opt/local/lib -lpangoft2-1.0 -Wl,-R/opt/local/lib -lpango-1.0 -Wl,-R/opt/local/lib -lgobject-2.0 -Wl,-R/opt/local/lib -lglib-2.0 -lintl -Wl,-R/opt/local/lib -lfontconfig -Wl,-R/opt/local/lib -lfreetype -Wl,--end-group -Wl,--no-as-needed -luno_sal -o $I/program/pluginapp.bin ld: fatal: library -luno_sal: not found = Either 'sdk/lib' needs to be added as a runpath-link (which works fine manually) or a symlink to libuno_sal.so.3 would need to be created in 'ure/lib' as that path is already used. -L$I/sdk/lib should be on the above command line (and is on Linux) via -L$(INSTDIR)/$(SDKDIRNAME)/lib in the definition of gb_LinkTarget_get_linksearchpath_for_layer in solenv/gbuild/platform/com_GCC_class.mk. No idea why that does not work for you on SunOS. Stephan Hi, Thanks for the pointer, and yes this file is included in solaris.mk as it is in unxgcc.mk... So, I was curious to notice that nsplugin seemed to work, and in comparing the two mk files the following extract from Executable_pluginapp.bin.mk is the only pertinent difference: # the orignal dmakefile said: don't ask, it's ugly ifeq ($(OS),SOLARIS) $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ -z nodefs \ )) endif when I look into gb_Executable_set_ldflags, the problem is in LinkTarget.mk: # call gb_LinkTarget_add_ldflags,linktarget,ldflags define gb_LinkTarget_add_ldflags $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2) endef # real use in RepositoryExternal.mk # call gb_LinkTarget_set_ldflags,linktarget,ldflags define gb_LinkTarget_set_ldflags $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2) ^^ Earlier in LinkTarget.mk your function is evaluted thus: $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call gb_LinkTarget__get_ldflags,$(2)) therefore overridden by the subsequent set_ldflags call. In summary, the following patch to Executable_pluginapp.bin.mk seems to build for now (the first part is because motif is, well...:-): $ pkgdiff Executable_pluginapp.bin.mk $NetBSD$ --- Executable_pluginapp.bin.mk.orig2014-04-30 19:49:45.0 + +++ Executable_pluginapp.bin.mk @@ -33,15 +33,7 @@ $(eval $(call gb_Executable_use_librarie sal \ )) -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ - -lXm \ - -lXt \ - -lXext \ - -lX11 \ - -ldl \ -)) -else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) +ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) $(eval $(call gb_Executable_add_libs,pluginapp.bin,\ -lXt \ -lXext \ @@ -73,7 +65,7 @@ $(eval $(call gb_Executable_use_external )) # the orignal dmakefile said: don't ask, it's ugly -ifeq ($(OS),SOLARIS) +ifeq ($(OS),XSOLARIS) $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ -z nodefs \ )) BTW, for the moment, I don't have an issue with omitting the -znodefs perhaps an old problem since resolved... will keep an eye out. cheers ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column3.cxx | 54
1 file changed, 54 deletions(-)
New commits:
commit a8df8e319fa6b328534855a17e6fcac8aeb4dc25
Author: Stephan Bergmann
Date: Fri May 23 09:23:21 2014 +0200
Remove dead code
Change-Id: I198fb0193fed891c4dd8a8a92c29e36f6c4d48b9
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 2d54fd5..d023b16 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -140,41 +140,6 @@ void ScColumn::FreeAll()
namespace {
-/**
- * Collect all formula cells for later mass-unregistration. Also tag row
- * positions of all non-empty cells in the range.
- */
-class DeleteRowsHandler
-{
-ScDocument& mrDoc;
-std::vector maRows;
-std::vector maFormulaCells;
-public:
-DeleteRowsHandler(ScDocument& rDoc) : mrDoc(rDoc) {}
-
-void operator() (size_t nRow, ScFormulaCell* pCell)
-{
-maFormulaCells.push_back(pCell);
-maRows.push_back(nRow);
-}
-
-void operator() (mdds::mtv::element_t nType, size_t nTopRow, size_t
nDataSize)
-{
-if (nType == sc::element_type_empty)
-// Ignore empty cells.
-return;
-
-for (size_t i = 0; i < nDataSize; ++i)
-// Tag all non-empty cells.
-maRows.push_back(i + nTopRow);
-}
-
-const std::vector& getNonEmptyRows() const
-{
-return maRows;
-}
-};
-
class ShiftFormulaPosHandler
{
public:
@@ -185,25 +150,6 @@ public:
}
};
-class RangeBroadcaster
-{
-ScDocument& mrDoc;
-ScHint maHint;
-public:
-RangeBroadcaster(ScDocument& rDoc, SCTAB nTab, SCCOL nCol) :
-mrDoc(rDoc),
-maHint(SC_HINT_DATACHANGED, ScAddress(nCol, 0, nTab)) {}
-
-void operator() (const sc::RowSpan& rSpan)
-{
-SCROW nRow1 = rSpan.mnRow1, nRow2 = rSpan.mnRow2;
-maHint.GetAddress().SetRow(nRow1);
-ScRange aRange(maHint.GetAddress());
-aRange.aEnd.SetRow(nRow2);
-mrDoc.AreaBroadcastInRange(aRange, maHint);
-}
-};
-
}
void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/hyphen
external/hyphen/UnpackedTarball_hyphen.mk |1 +
external/hyphen/hyphen-c99.patch.0| 13 +
2 files changed, 14 insertions(+)
New commits:
commit e21cb524274c6719fe953001a19ba2124f1e8385
Author: Stephan Bergmann
Date: Fri May 23 09:37:23 2014 +0200
external/hypen: Fix for pre-C99
Change-Id: Iff0692768cbcaa68f79404a9a933044fe8bb9096
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk
b/external/hyphen/UnpackedTarball_hyphen.mk
index c112b35..72d54fd 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
+ external/hyphen/hyphen-c99.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-c99.patch.0
b/external/hyphen/hyphen-c99.patch.0
new file mode 100644
index 000..83930cb
--- /dev/null
+++ b/external/hyphen/hyphen-c99.patch.0
@@ -0,0 +1,13 @@
+--- hyphen.c
hyphen.c
+@@ -382,8 +382,9 @@
+ if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+ int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+ wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f;
+ MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
+-FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
+ free(buff);
+ return f;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - oox/source
oox/source/drawingml/textbodycontext.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit e6300f83d08fd959596551dcd660eb0fbfb248a6
Author: Miklos Vajna
Date: Fri May 23 09:30:26 2014 +0200
DOCX import: recurse into w:ins in groupshape text
Groupshape text is provided by editeng, redlining is available in Writer
text only. But still, instead of ignoring both deletions and insertions
in group shape text, we could at least show the latest version
correctly, i.e. ignore deletions but import insertions.
Change-Id: I12df2ca1a8d27f9496a8036e521f8820d7075053
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index 28b56e4..69b2396 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -90,6 +90,13 @@ ContextHandlerRef TextParagraphContext::onCreateContext(
sal_Int32 aElementToken
case OOX_TOKEN( doc, sdt ):
case OOX_TOKEN( doc, sdtContent ):
return this;
+case OOX_TOKEN( doc, del ):
+break;
+case OOX_TOKEN( doc, ins ):
+return this;
+break;
+default:
+SAL_WARN("oox", "TextParagraphContext::onCreateContext: unhandled
element: " << getBaseToken(aElementToken));
}
return 0;
commit fa017a3e503cc654b8756e1056feb1ee98225310
Author: Miklos Vajna
Date: Fri May 23 09:17:01 2014 +0200
DOCX import: detect inline shape inside shape text
Change-Id: Ia1614759558e73686fce137eb52fb623eae4a4e5
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index 1dd5a6c..28b56e4 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -146,6 +146,8 @@ ContextHandlerRef RegularTextRunContext::onCreateContext(
sal_Int32 aElementToke
case OOX_TOKEN( doc, t ):
mbIsInText = true;
break;
+case OOX_TOKEN( doc, drawing ):
+break;
default:
SAL_WARN("oox", "RegularTextRunContext::onCreateContext: unhandled
element: " << getBaseToken(aElementToken));
break;
commit 86283cd75e798ce7fd5ca0e91ac3ea0733d31404
Author: Miklos Vajna
Date: Fri May 23 08:50:50 2014 +0200
DOCX import: detect table in groupshape
Change-Id: Iba7bb88139a97e919739363cd85f3e822062b694
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index 9821149..1dd5a6c 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -181,6 +181,8 @@ ContextHandlerRef TextBodyContext::onCreateContext(
sal_Int32 aElementToken, con
case OOX_TOKEN( doc, sdtPr ):
case OOX_TOKEN( doc, sdtEndPr ):
break;
+case OOX_TOKEN( doc, tbl ):
+break;
default:
SAL_WARN("oox", "TextBodyContext::onCreateContext: unhandled element:
" << getBaseToken(aElementToken));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxsdrexport.cxx | 26 --
1 file changed, 20 insertions(+), 6 deletions(-)
New commits:
commit 2a99a22af0062e9561046a4a00f12dc97e5bd4f4
Author: Tor Lillqvist
Date: Fri May 23 10:33:09 2014 +0300
WaE: comparison is always false due to limited range of data type
Signed-off-by: Stephan Bergmann ; plus some cosmetics
to
silence loplugin:bodynotinblock.
Change-Id: I8ff9da84021635c9de66c9544b46834a2d9efcf7
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 50bfb7d..c8ffe94 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -536,19 +536,33 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size& rS
sal_uInt64 cx = 0 ;
sal_uInt64 cy = 0 ;
const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
+
+// the 'Size' type uses 'long' for width and height, so on
+// platforms where 'long' is 32 bits they can obviously never be
+// larger than the max signed 32-bit integer.
+#if SAL_TYPES_SIZEOFLONG > 4
if (rSize.Width() > MAX_INTEGER_VALUE)
cx = MAX_INTEGER_VALUE ;
-else if (0 > rSize.Width())
-cx = 0 ;
else
-cx = rSize.Width();
+#endif
+{
+if (0 > rSize.Width())
+cx = 0 ;
+else
+cx = rSize.Width();
+}
+#if SAL_TYPES_SIZEOFLONG > 4
if (rSize.Height() > MAX_INTEGER_VALUE)
cy = MAX_INTEGER_VALUE ;
-else if (0 > rSize.Height())
-cy = 0 ;
else
-cy = rSize.Height();
+#endif
+{
+if (0 > rSize.Height())
+cy = 0 ;
+else
+cy = rSize.Height();
+}
OString aWidth(OString::number(TwipsToEMU(cx)));
//we explicitly check the converted EMU value for the range as mentioned
in above comment.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
New commits:
commit e7119457f30c5c6ffcc724d8438df8de225ba99b
Author: Christian Lohmaier
Date: Thu May 22 15:51:54 2014 +0200
using xargs for string manipulation is somewhat of an abuse
(and breaks the build on windows/cygwin for some reason, although
running the find/xargs command by itself works just fine)
So just use awk instead and have a nicer solution without breaking the
build
Change-Id: I24b9f52c0b84c2e8019f3f6719a307fe508fb755
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 1eb591b..0bc71a9 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -595,27 +595,28 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- $(call gb_Helper_abbreviate_dirs, \
- echo '' > $@ \
- && ( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)
-name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo
'{}') >> $@ \
- && echo '' >> $@ \
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
+-name *.xcu -size +0c \
+ | awk 'BEGIN{print ""} \
+ {print ""$$0""} \
+ END {print ""}' > $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo '' > $@ \
- && $(call gb_Helper_abbreviate_dirs, \
- (find $(call gb_XcuResTarget_get_target,registry/$*/) -name
*.xcu -print0 | xargs -n1 -0 -I '{}' echo '{}') >> $@ \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
- $(foreach driver,$(postprocess_DRIVERS), \
- && (find $(call
gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I
'{}' echo '{}') >> $@ \
- ) \
- ) \
- $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
- && (find $(call gb_XcuResTarget_get_target,updchk/$*/)
-name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '{}') >>
$@ \
- ) \
- ) \
- && echo '' >> $@
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,registry/$*/)\
+$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+$(foreach driver,$(postprocess_DRIVERS),\
+$(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
+$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+$(call gb_XcuResTarget_get_target,updchk/$*/))\
+-name *.xcu \
+ | awk 'BEGIN{print ""} \
+ {print ""$$0""} \
+ END {print ""}' > $@ \
+ )
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/hyphen
external/hyphen/UnpackedTarball_hyphen.mk|1 -
external/hyphen/hyphen-c99.patch.0 | 13 -
external/hyphen/hyphen-fdo48017-wfopen.patch |7 ---
3 files changed, 4 insertions(+), 17 deletions(-)
New commits:
commit 24819d71ec9ce73840e82791c0219fe012e45c37
Author: Stephan Bergmann
Date: Fri May 23 09:51:11 2014 +0200
Fold hyphen-c99.patch.0 into hyphen-fdo48017-wfopen.patch
Change-Id: I2f866aa16704bc5492e0e0b78136fdfe41caa7a5
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk
b/external/hyphen/UnpackedTarball_hyphen.mk
index 72d54fd..c112b35 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
- external/hyphen/hyphen-c99.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-c99.patch.0
b/external/hyphen/hyphen-c99.patch.0
deleted file mode 100644
index 83930cb..000
--- a/external/hyphen/hyphen-c99.patch.0
+++ /dev/null
@@ -1,13 +0,0 @@
hyphen.c
-+++ hyphen.c
-@@ -382,8 +382,9 @@
- if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
- int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
- wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
-+FILE * f;
- MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
--FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
-+f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
- free(buff);
- return f;
- }
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch
b/external/hyphen/hyphen-fdo48017-wfopen.patch
index 9a73b4a..27cffa0 100644
--- a/external/hyphen/hyphen-fdo48017-wfopen.patch
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -13,7 +13,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
#define noVERBOSE
/* calculate hyphenmin values with long ligature length (2 or 3 characters
-@@ -371,6 +376,21 @@
+@@ -371,6 +376,22 @@
}
}
@@ -23,8 +23,9 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
+if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f;
+MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
+free(buff);
+return f;
+}
@@ -35,7 +36,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
HyphenDict *
hnj_hyphen_load (const char *fn)
{
-@@ -383,7 +403,7 @@
+@@ -383,7 +404,7 @@
HashEntry *e;
int state_num = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - dbaccess/source framework/inc framework/source include/comphelper reportdesign/source sfx2/source svx/source sw/source writerperfect/source xmlsecurity/sou
dbaccess/source/ui/inc/TableController.hxx |2 +-
dbaccess/source/ui/tabledesign/TableController.cxx |2 +-
framework/inc/uielement/progressbarwrapper.hxx |8
framework/source/uielement/progressbarwrapper.cxx |8
include/comphelper/propmultiplex.hxx |3 ++-
reportdesign/source/ui/inc/SectionWindow.hxx |3 ++-
reportdesign/source/ui/report/SectionWindow.cxx|3 ++-
sfx2/source/doc/objxtor.cxx|9 -
svx/source/dialog/langbox.cxx |7 +--
sw/source/core/txtnode/ndtxt.cxx |2 +-
writerperfect/source/writer/WordPerfectImportFilter.cxx|2 +-
writerperfect/source/writer/WordPerfectImportFilter.hxx|2 +-
xmlsecurity/source/component/documentdigitalsignatures.cxx |2 +-
xmlsecurity/source/component/documentdigitalsignatures.hxx |2 +-
14 files changed, 34 insertions(+), 21 deletions(-)
New commits:
commit 131d553864d52b21d1198806484b67a82e1b2f52
Author: Caolán McNamara
Date: Thu May 22 21:12:52 2014 +0100
coverity#704940 Unchecked dynamic_cast
Change-Id: I53662b9d48ae44c21c9cc79bda01487d87e8dfdd
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 386e4c5..5b42a20 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4474,7 +4474,7 @@ namespace {
{
const SfxBoolItem* pIsCountedInListItem =
dynamic_cast(pItem);
-if ( pIsCountedInListItem->GetValue() !=
+if ( pIsCountedInListItem && pIsCountedInListItem->GetValue() !=
mrTxtNode.IsCountedInList() )
{
mbUpdateListCount = true;
commit f1b030949b6b8841f414354aa668dc9a96f1d5d3
Author: Caolán McNamara
Date: Thu May 22 21:10:27 2014 +0100
coverity#1215310 Uncaught exception
Change-Id: I8d9663f8dedda8e7006e7ac6545cb15188a1ec2d
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 42f0bb0..c431918 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -199,7 +199,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
bool DocumentDigitalSignatures::ImplViewSignatures(
const Reference< css::embed::XStorage >& rxStorage, const Reference<
css::io::XStream >& xSignStream,
-DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException)
+DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException,
std::exception)
{
bool bChanges = false;
DigitalSignaturesDialog aSignaturesDialog(
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx
b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index cdcdffc..b1a5b5e 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -50,7 +50,7 @@ private:
//Indicates if the document already contains a document signature
bool m_bHasDocumentSignature;
-bool ImplViewSignatures( const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage >& rxStorage, const
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream,
DocumentSignatureMode eMode, bool bReadOnly ) throw
(::com::sun::star::uno::RuntimeException);
+bool ImplViewSignatures( const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage >& rxStorage, const
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream,
DocumentSignatureMode eMode, bool bReadOnly ) throw
(css::uno::RuntimeException, std::exception);
bool ImplViewSignatures( const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage >& rxStorage, const
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >&
xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw
(::com::sun::star::uno::RuntimeException);
com::sun::star::uno::Sequence<
::com::sun::star::security::DocumentSignatureInformation >
ImplVerifySignatures( const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage >& rxStorage, const
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >&
xSignStream, DocumentSignatureMode eMode ) throw
(::com::sun::star::uno::RuntimeException);
commit c320dc7fe54e423f005147e0573f6f887ced70ea
Author: Caolán McNamara
Date: Thu May 22 21:09:21 2014 +0100
coverity#1215311 Uncaught exception
Change-Id: Ic000d3a3920dddb8cc8585bb31127d14cfc35eb7
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx
b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index ee0aad2..e70eef6 100644
--- a/write
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/opencl-test.cxx | 35 ---
1 file changed, 12 insertions(+), 23 deletions(-)
New commits:
commit 77bc28be2d8c206b3669d41171d6b906fd45c8fb
Author: Stephan Bergmann
Date: Fri May 23 10:07:07 2014 +0200
Always use CPPUNIT_ASSERT_DOUBLES_EQUAL when comparing floating point values
Change-Id: I2ea94a510fd79f6fe3dcc5021d142b7b5f99f67f
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 9ac41a2..951f4b5 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -714,7 +714,7 @@ void ScOpenclTest::testSharedFormulaXLSGroundWater()
{
double fLibre = pDoc->GetValue(ScAddress(11,i,1));
double fExcel = pDocRes->GetValue(ScAddress(11,i,1));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
xDocSh->DoClose();
xDocShRes->DoClose();
@@ -740,14 +740,14 @@ void ScOpenclTest::testSharedFormulaXLS()
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-6
for (SCROW i = 6; i < 14; ++i)
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-8
@@ -755,7 +755,7 @@ void ScOpenclTest::testSharedFormulaXLS()
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-10
@@ -763,7 +763,7 @@ void ScOpenclTest::testSharedFormulaXLS()
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-9
@@ -772,7 +772,7 @@ void ScOpenclTest::testSharedFormulaXLS()
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
//double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
// There seems to be a bug in LibreOffice beta
-CPPUNIT_ASSERT_EQUAL(/*fExcel*/ 60.0, fLibre);
+ASSERT_DOUBLES_EQUAL(/*fExcel*/ 60.0, fLibre);
}
// AMLOEXT-9
@@ -780,25 +780,25 @@ void ScOpenclTest::testSharedFormulaXLS()
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-11
for (SCROW i = 28; i < 35; ++i)
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-11; workaround for a Calc beta bug
-CPPUNIT_ASSERT_EQUAL(25.0, pDoc->GetValue(ScAddress(2, 35, 0)));
-CPPUNIT_ASSERT_EQUAL(24.0, pDoc->GetValue(ScAddress(2, 36, 0)));
+ASSERT_DOUBLES_EQUAL(25.0, pDoc->GetValue(ScAddress(2, 35, 0)));
+ASSERT_DOUBLES_EQUAL(24.0, pDoc->GetValue(ScAddress(2, 36, 0)));
// AMLOEXT-12
for (SCROW i = 38; i < 43; ++i)
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-14
@@ -806,7 +806,7 @@ void ScOpenclTest::testSharedFormulaXLS()
{
double fLibre = pDoc->GetValue(ScAddress(5, i, 1));
double fExcel = pDocRes->GetValue(ScAddress(5, i, 1));
-CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
+ASSERT_DOUBLES_EQUAL(fExcel, fLibre);
}
// AMLOEXT-15, AMLOEXT-16, and AMLOEXT-17
@@ -1193,7 +1193,6 @@ void ScOpenclTest::testFinacialFvscheduleFormula()
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-//CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
xDocSh->DoClose();
@@ -1265,7 +1264,6 @@ void ScOpenclTest::testFinacialIRRFormula()
{
double fLibre = pDoc->GetValue(ScAddress(2, i, 0));
double fExcel = pDocRes->GetValue(ScAddress(2, i, 0));
-//CPPUNIT_ASSERT_EQUAL(fExcel, fLibre);
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
xDocSh->DoClose();
@@ -1383,7 +1381,6 @@ void ScOpenclTest::testFinacialSLNFormula()
{
double fLibre = pDoc->GetValue(ScAddress(3, i, 0));
double fExcel = pDocRes->GetValue(S
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 13 +-
sd/source/ui/view/drviews2.cxx | 79 ++---
2 files changed, 39 insertions(+), 53 deletions(-)
New commits:
commit 57320f34b5d73beeae23e8955b9b234fb3f1a435
Author: Takeshi Abe
Date: Fri May 23 14:57:01 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: Ifd98e11380bf00f6126e4c81bcd0cbaf5b22f70d
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 5999175..15f2c7c 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -90,6 +90,7 @@
#include
#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -271,14 +272,14 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-VclAbstractDialog* pDlg = pFact ? pFact->CreateSdPhotoAlbumDialog(
+boost::scoped_ptr pDlg(pFact ?
pFact->CreateSdPhotoAlbumDialog(
mrSlideSorter.GetContentWindow().get(),
-pDocument) : 0;
+pDocument) : 0);
if (pDlg)
{
pDlg->Execute();
-delete pDlg;
+pDlg.reset();
}
rRequest.Done ();
}
@@ -917,9 +918,9 @@ void SlotManager::RenameSlide (void)
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
-AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog(
+boost::scoped_ptr
aNameDlg(pFact->CreateSvxNameDialog(
mrSlideSorter.GetContentWindow().get(),
-aPageName, aDescr);
+aPageName, aDescr));
DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl
), true );
@@ -939,7 +940,7 @@ void SlotManager::RenameSlide (void)
DBG_ASSERT( bResult, "Couldn't rename slide" );
}
}
-delete aNameDlg;
+aNameDlg.reset();
// Tell the slide sorter about the name change (necessary for
// accessibility.)
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 7a6c14f7..99542d8 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -171,6 +171,7 @@
#include
#include "ViewShellBase.hxx"
+#include
namespace {
const char CustomAnimationPanelId[] = "CustomAnimationPanel";
@@ -448,7 +449,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");
-AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog(
GetActiveWindow(), aPageName, aDescr );
+boost::scoped_ptr
aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell,
RenameSlideHdl ), true );
@@ -467,7 +468,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
DBG_ASSERT( bResult, "Couldn't rename slide" );
}
}
-delete aNameDlg;
}
Cancel();
@@ -823,7 +823,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_SET_DEFAULT:
{
-SfxItemSet* pSet = NULL;
+boost::scoped_ptr pSet;
if (mpDrawView->IsTextEdit())
{
@@ -833,7 +833,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
pOutl->RemoveFields(true, (TypeId)
SvxURLField::StaticType());
}
-pSet = new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END
);
+pSet.reset(new SfxItemSet( GetPool(), EE_ITEMS_START,
EE_ITEMS_END ));
mpDrawView->SetAttributes( *pSet, true );
}
else
@@ -861,7 +861,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
}
-pSet = new SfxItemSet( GetPool() );
+pSet.reset(new SfxItemSet( GetPool() ));
mpDrawView->SetAttributes( *pSet, true );
sal_uLong j = 0;
@@ -899,7 +899,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
std::pair &rAttr =
aAttrList[j++];
-SfxItemSet* pNewSet = rAttr.first;
+
[Bug 55410] on windows automatically fill in the default user's name into tools->options->user data
https://bugs.freedesktop.org/show_bug.cgi?id=55410 --- Comment #4 from Tor Lillqvist --- That SHGetUserDisplayName() seems to be undocumented, so we definitely should *not* use that. Which is what Urmas meant, I guess. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/drawingml/fillproperties.hxx |2 +-
oox/source/drawingml/fillproperties.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cf287f4e3ff632b9ffbecc753ef9a17f27b6c04a
Author: Tor Lillqvist
Date: Fri May 23 11:36:56 2014 +0300
WaE: passing class rtl::OUString by value, rather pass by reference
Change-Id: I05aa9a5ad5d97a1ead3d30298f45e7aeb62d0652
diff --git a/include/oox/drawingml/fillproperties.hxx
b/include/oox/drawingml/fillproperties.hxx
index dcf3afb..550fd82 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -86,7 +86,7 @@ struct ArtisticEffectProperties
static OUString getEffectString( sal_Int32 nToken );
/** Translate effect strings to tokens. */
-static sal_Int32getEffectToken( OUString sName );
+static sal_Int32getEffectToken( const OUString& sName );
};
struct BlipFillProperties
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 9677042..7abd500 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -701,7 +701,7 @@ OUString ArtisticEffectProperties::getEffectString(
sal_Int32 nToken )
return OUString();
}
-sal_Int32 ArtisticEffectProperties::getEffectToken( OUString sName )
+sal_Int32 ArtisticEffectProperties::getEffectToken( const OUString& sName )
{
// effects
if( sName == "artisticBlur" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox
include/oox/ole/oleobjecthelper.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 38d7b82c277599f2e613256c4353aa7dfdc219ec
Author: Tor Lillqvist
Date: Fri May 23 12:17:50 2014 +0300
OleObjectInfo is used from the scfilt library so must be public
Change-Id: Ib80278e52640b0c132bcc5b303d277a4e7ae2024
diff --git a/include/oox/ole/oleobjecthelper.hxx
b/include/oox/ole/oleobjecthelper.hxx
index a723949..ef32483 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
#define INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
+#include
#include
namespace com { namespace sun { namespace star {
@@ -36,7 +37,7 @@ namespace ole {
/** Contains generic information about an OLE object. */
-struct OleObjectInfo
+struct OOX_DLLPUBLIC OleObjectInfo
{
StreamDataSequence maEmbeddedData; ///< Data of an embedded OLE
object.
OUString maTargetLink; ///< Path to external data for linked OLE
object.
___
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' - sw/source
sw/source/filter/ww8/ww8par5.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit d4a19c4098f4556f05666ed92a85c6138b4f769a Author: LuboÅ¡ LuÅák Date: Fri May 23 11:35:10 2014 +0200 MSWord uses \xb for linebreaks in DB fields (bnc#878854) Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441 diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5e9c930..aba9ee4 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2413,6 +2413,8 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr ) pSBase->WW8ReadString( *pStrm, aResult, pPlcxMan->GetCpOfs()+ pF->nSRes, pF->nLRes, eTextCharSet ); +aResult = aResult.replace( '\xb', '\n' ); + aFld.InitContent(aResult); rDoc.InsertPoolItem(*pPaM, SwFmtFld( aFld ), 0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7772b310aac7a098a6b7702e1f1f227bc7eda5b9 Author: LuboÅ¡ LuÅák Date: Fri May 23 11:35:10 2014 +0200 MSWord uses \xb for linebreaks in DB fields (bnc#878854) Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441 diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5e9c930..aba9ee4 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2413,6 +2413,8 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr ) pSBase->WW8ReadString( *pStrm, aResult, pPlcxMan->GetCpOfs()+ pF->nSRes, pF->nLRes, eTextCharSet ); +aResult = aResult.replace( '\xb', '\n' ); + aFld.InitContent(aResult); rDoc.InsertPoolItem(*pPaM, SwFmtFld( aFld ), 0); ___ 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/window/window.cxx | 120 +--
1 file changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 938a070f5d71f8e7c703dcbf2098e44b9d8c5a5f
Author: Chris Sherlock
Date: Fri May 23 19:41:01 2014 +1000
move lcl_createWindowInfo to correct spot in window.cxx
Change-Id: Icfcfe379db2ba8eee89314108df47bae024e060e
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 67a1c6a..244a48d 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -140,6 +140,29 @@ Window::Window( Window* pParent, const ResId& rResId )
Show();
}
+#if OSL_DEBUG_LEVEL > 0
+namespace
+{
+OString lcl_createWindowInfo(const Window& i_rWindow)
+{
+// skip border windows, they don't carry information which helps
diagnosing the problem
+const Window* pWindow( &i_rWindow );
+while ( pWindow && ( pWindow->GetType() == WINDOW_BORDERWINDOW ) )
+pWindow = pWindow->GetWindow( WINDOW_FIRSTCHILD );
+if ( !pWindow )
+pWindow = &i_rWindow;
+
+OStringBuffer aErrorString;
+aErrorString.append(' ');
+aErrorString.append(typeid( *pWindow ).name());
+aErrorString.append(" (");
+aErrorString.append(OUStringToOString(pWindow->GetText(),
RTL_TEXTENCODING_UTF8));
+aErrorString.append(")");
+return aErrorString.makeStringAndClear();
+}
+}
+#endif
+
Window::~Window()
{
vcl::LazyDeletor::Undelete( this );
@@ -1401,43 +1424,6 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
return nHitTest;
}
-bool Window::ImplIsRealParentPath( const Window* pWindow ) const
-{
-pWindow = pWindow->GetParent();
-while ( pWindow )
-{
-if ( pWindow == this )
-return true;
-pWindow = pWindow->GetParent();
-}
-
-return false;
-}
-
-bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const
-{
-do
-{
-if ( !bSystemWindow && pWindow->ImplIsOverlapWindow() )
-break;
-
-pWindow = pWindow->ImplGetParent();
-
-if ( pWindow == this )
-return true;
-}
-while ( pWindow );
-
-return false;
-}
-
-bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow )
const
-{
-if ( this == pWindow )
-return true;
-return ImplIsChild( pWindow, bSystemWindow );
-}
-
int Window::ImplTestMousePointerSet()
{
// as soon as mouse is captured, switch mouse-pointer
@@ -1494,6 +1480,43 @@ PointerStyle Window::ImplGetMousePointer() const
return ePointerStyle;
}
+bool Window::ImplIsRealParentPath( const Window* pWindow ) const
+{
+pWindow = pWindow->GetParent();
+while ( pWindow )
+{
+if ( pWindow == this )
+return true;
+pWindow = pWindow->GetParent();
+}
+
+return false;
+}
+
+bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const
+{
+do
+{
+if ( !bSystemWindow && pWindow->ImplIsOverlapWindow() )
+break;
+
+pWindow = pWindow->ImplGetParent();
+
+if ( pWindow == this )
+return true;
+}
+while ( pWindow );
+
+return false;
+}
+
+bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow )
const
+{
+if ( this == pWindow )
+return true;
+return ImplIsChild( pWindow, bSystemWindow );
+}
+
void Window::ImplResetReallyVisible()
{
bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible;
@@ -3383,29 +3406,6 @@ void Window::ImplNewInputContext()
pFocusWin->mpFontCache->Release( pFontEntry );
}
-#if OSL_DEBUG_LEVEL > 0
-namespace
-{
-OString lcl_createWindowInfo(const Window& i_rWindow)
-{
-// skip border windows, they don't carry information which helps
diagnosing the problem
-const Window* pWindow( &i_rWindow );
-while ( pWindow && ( pWindow->GetType() == WINDOW_BORDERWINDOW ) )
-pWindow = pWindow->GetWindow( WINDOW_FIRSTCHILD );
-if ( !pWindow )
-pWindow = &i_rWindow;
-
-OStringBuffer aErrorString;
-aErrorString.append(' ');
-aErrorString.append(typeid( *pWindow ).name());
-aErrorString.append(" (");
-aErrorString.append(OUStringToOString(pWindow->GetText(),
RTL_TEXTENCODING_UTF8));
-aErrorString.append(")");
-return aErrorString.makeStringAndClear();
-}
-}
-#endif
-
void Window::doLazyDelete()
{
SystemWindow* pSysWin = dynamic_cast(this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-4'
Tag 'cp-4.2-4' created by Andras Timar at 2014-05-23 10:47 -0700 cp-4.2-4 Changes since cp-4.2-3-56: --- 0 files changed --- ___ 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/cp-4.2-4'
Tag 'cp-4.2-4' created by Andras Timar at 2014-05-23 10:47 -0700 cp-4.2-4 Changes since cp-4.2-3-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/cp-4.2-4'
Tag 'cp-4.2-4' created by Andras Timar at 2014-05-23 10:47 -0700 cp-4.2-4 Changes since libreoffice-4-2-branch-point-7: --- 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/cp-4.2-4'
Tag 'cp-4.2-4' created by Andras Timar at 2014-05-23 10:47 -0700 cp-4.2-4 Changes since cp-4.2-2: Christian Lohmaier (1): update translations for 4.2.4 rc2 --- source/ast/formula/source/core/resource.po | 20 source/ast/svx/source/sidebar/area.po | 10 source/ca/dictionaries/hu_HU/dialog.po | 12 source/ca/helpcontent2/source/text/shared/00.po | 8 source/ca/helpcontent2/source/text/shared/01.po | 10 source/ca/helpcontent2/source/text/shared/02.po | 12 source/ca/helpcontent2/source/text/shared/guide.po | 24 source/ca/helpcontent2/source/text/smath/01.po | 8 source/ca/helpcontent2/source/text/swriter/librelogo.po | 10 source/ca/nlpsolver/src/locale.po | 10 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 6 source/ca/sc/source/ui/StatisticsDialogs.po | 10 source/ca/sc/source/ui/src.po | 12 source/ca/scp2/source/accessories.po| 28 source/ca/scp2/source/ooo.po| 28 source/ca/sd/uiconfig/simpress/ui.po| 13 source/ca/svtools/source/control.po | 11 source/ca/svtools/source/misc.po| 12 source/ca/svx/source/dialog.po | 15 source/ca/svx/source/src.po | 16 source/ca/svx/source/stbctrls.po| 10 source/ca/sw/uiconfig/swriter/ui.po | 6 source/ca/uui/source.po | 10 source/ca/wizards/source/formwizard.po | 12 source/ca/wizards/source/template.po| 12 source/cs/helpcontent2/source/text/scalc.po | 6 source/cs/helpcontent2/source/text/scalc/01.po | 6 source/cs/sc/source/ui/src.po | 6 source/de/sw/uiconfig/swriter/ui.po | 8 source/es/basctl/source/basicide.po | 10 source/es/chart2/source/controller/dialogs.po | 12 source/es/cui/source/dialogs.po | 8 source/es/cui/source/tabpages.po| 8 source/es/cui/uiconfig/ui.po| 24 source/es/dbaccess/source/ui/dlg.po | 10 source/es/dbaccess/source/ui/querydesign.po | 16 source/es/extensions/source/abpilot.po | 12 source/es/extensions/source/propctrlr.po| 10 source/es/helpcontent2/source/text/scalc/01.po | 8 source/es/helpcontent2/source/text/schart/01.po | 8 source/es/helpcontent2/source/text/shared/01.po | 12 source/es/instsetoo_native/inc_openoffice/windows/msi_languages.po | 12 source/es/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/es/sc/source/ui/src.po | 34 source/es/sc/uiconfig/scalc/ui.po | 10 source/es/svx/source/items.po | 8 source/es/svx/source/svdraw.po | 16 source/fa/sw/source/ui/app.po | 16 source/gl/helpcontent2/source/text/sbasic/guide.po | 44 source/gl/helpcontent2/source/text/sbasic/shared.po | 80 source/gl/helpcontent2/source/text/sbasic/shared/02.po | 8 source/gl/helpcontent2/source/text/scalc/00.po | 18 source/gl/helpcontent2/source/text/scalc/01.po | 1488 ++ source/gl/helpcontent2/source/text/schart/01.po | 14 source/gl/helpcontent2/source/text/shared/00.po | 10 source/gl/helpcontent2/source/text/swriter/01.po| 43 s
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.1-8'
Tag 'cp-4.1-8' created by Andras Timar at 2014-05-23 10:50 -0700 cp-4.1-8 Changes since cp-4.1-1-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.1-8'
Tag 'cp-4.1-8' created by Andras Timar at 2014-05-23 10:50 -0700 cp-4.1-8 Changes since cp-4.1-7-26: --- 0 files changed --- ___ 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/cp-4.1-8'
Tag 'cp-4.1-8' created by Andras Timar at 2014-05-23 10:50 -0700 cp-4.1-8 Changes since cp-4.1-6-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: writerfilter/inc writerfilter/source
writerfilter/inc/ooxml/OOXMLDocument.hxx |2 +-
writerfilter/source/filter/ImportFilter.cxx |8
writerfilter/source/ooxml/OOXMLStreamImpl.cxx |4
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 2c66056bec75105566c5dcbb9726dd77b83be768
Author: Miklos Vajna
Date: Fri May 23 11:40:59 2014 +0200
DOCX import: detect document signature
Change-Id: Ic84b1f1446d6ab1a1529de4e0a435afbf62915a7
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index da25adf..18c21da 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -75,7 +75,7 @@ class OOXMLStream
{
public:
enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE,
NUMBERING,
-FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS,
ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT,
FOOTER, HEADER };
+FOOTNOTES, ENDNOTES, COMMENTS, THEME, CUSTOMXML, CUSTOMXMLPROPS,
ACTIVEX, ACTIVEXBIN, GLOSSARY, CHARTS, EMBEDDINGS, SETTINGS, VBAPROJECT,
FOOTER, HEADER, SIGNATURE };
typedef boost::shared_ptr Pointer_t;
virtual ~OOXMLStream() {}
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index 277f2da..2380d1f 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -175,6 +175,14 @@ sal_Bool WriterFilter::filter( const uno::Sequence<
beans::PropertyValue >& aDes
oox::GraphicHelper gHelper( m_xContext, xFrame, xVbaPrjStrg );
aVbaProject.importVbaProject( *xVbaPrjStrg, gHelper );
}
+
+// Document signature.
+writerfilter::ooxml::OOXMLStream::Pointer_t pSignatureStream;
+pSignatureStream =
writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext,
xInputStream, bRepairStorage, writerfilter::ooxml::OOXMLStream::SIGNATURE);
+if (pSignatureStream->getDocumentStream().is())
+{
+// TODO found, handle it.
+}
}
pStream.reset();
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index c000e78..759762a 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -157,6 +157,7 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Reference
static OUString
sFooterType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";);
static OUString
sHeaderType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";);
static OUString
sOleObjectType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";);
+static OUString
sSignatureType("http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin";);
// OOXML strict
static OUString
sDocumentTypeStrict("http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument";);
static OUString
sStylesTypeStrict("http://purl.oclc.org/ooxml/officeDocument/relationships/styles";);
@@ -264,6 +265,9 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Reference
sStreamType = sHeaderType;
sStreamTypeStrict = sHeaderTypeStrict;
break;
+case SIGNATURE:
+sStreamType = sSignatureType;
+break;
default:
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - sal/cppunittester
sal/cppunittester/cppunittester.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit c6feddb8ecbda5de417e4e0eaebd3ff9eafee7bb
Author: Michael Meeks
Date: Tue May 20 13:38:49 2014 +0100
Win32 - warn of extraordinary behaviour with LoadLibrary and long PATHs
Change-Id: I0a8ee157aa548a5b04df67a2355e3f4fd15e84cd
diff --git a/sal/cppunittester/cppunittester.cxx
b/sal/cppunittester/cppunittester.cxx
index 6e5258b..7ac8ab5 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -206,6 +206,14 @@ public:
manager.load(testlib, args);
} catch (const CppUnit::DynamicLibraryManagerException &e) {
std::cerr << "DynamicLibraryManagerException: \"" << e.what() <<
"\"\n";
+#ifdef WIN32
+const char *pPath = getenv ("PATH");
+if (pPath && strlen (pPath) > 256)
+{
+std::cerr << "Windows has significant build problems with long
PATH variables ";
+std::cerr << "please check your PATH variable and
re-autogen.\n";
+}
+#endif
return false;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 23 ++
1 file changed, 23 insertions(+)
New commits:
commit 7933b269ba4c5a49dd394eef15e98c55a19038ef
Author: Tor Lillqvist
Date: Fri May 23 13:12:05 2014 +0300
Reintroduce Win_GetShortPathName()
Change-Id: Id15d1d4d9b7fb9bb2a0a5f52b5ec1928c38bd27b
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 9f7028b..94abeb9 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -507,6 +507,29 @@ Reference < XHyphenatedWord > SAL_CALL
Hyphenator::queryAlternativeSpelling(
return NULL;
}
+#if defined(WNT)
+static OString Win_GetShortPathName( const OUString &rLongPathName )
+{
+OString aRes;
+
+sal_Unicode aShortBuffer[1024] = {0};
+sal_Int32 nShortBufSize = SAL_N_ELEMENTS( aShortBuffer );
+
+// use the version of 'GetShortPathName' that can deal with Unicode...
+sal_Int32 nShortLen = GetShortPathNameW(
+reinterpret_cast( rLongPathName.getStr() ),
+reinterpret_cast( aShortBuffer ),
+nShortBufSize );
+
+if (nShortLen < nShortBufSize) // conversion successful?
+aRes = OString( OU2ENC( OUString( aShortBuffer, nShortLen ),
osl_getThreadTextEncoding()) );
+else
+OSL_FAIL( "Win_GetShortPathName: buffer to short" );
+
+return aRes;
+}
+#endif //defined(WNT)
+
Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens(
const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale,
const ::com::sun::star::beans::PropertyValues& aProperties )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: suggestion for adding sdk/lib to pluginapp.bin or libuno_sal.so symlink in ure/lib
On 05/23/2014 08:59 AM, Richard PALO wrote: @@ -73,7 +65,7 @@ $(eval $(call gb_Executable_use_external )) # the orignal dmakefile said: don't ask, it's ugly -ifeq ($(OS),SOLARIS) +ifeq ($(OS),XSOLARIS) $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ -z nodefs \ )) BTW, for the moment, I don't have an issue with omitting the -znodefs perhaps an old problem since resolved... will keep an eye out. Ah, so either indeed drop it completely (which is probably best overall) or turn it into a gb_Executable_add_ldflags call. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Solaris build (was: suggestion for adding sdk/lib to pluginapp.bin or libuno_sal.so symlink in ure/lib)
On 23/05/14 08:59, Richard PALO wrote: > Le 21/05/14 10:56, Stephan Bergmann a écrit : >> On 05/21/2014 07:13 AM, Richard PALO wrote: >>> Either 'sdk/lib' needs to be added as a runpath-link (which works fine >>> manually) or a symlink to libuno_sal.so.3 would need to be created in >>> 'ure/lib' as that path is already used. >> >> -L$I/sdk/lib should be on the above command line (and is on Linux) via >> -L$(INSTDIR)/$(SDKDIRNAME)/lib in the definition of >> gb_LinkTarget_get_linksearchpath_for_layer in >> solenv/gbuild/platform/com_GCC_class.mk. No idea why that does not work >> for you on SunOS. >> >> Stephan > Hi, > Thanks for the pointer, and yes this file is included in solaris.mk as > it is in unxgcc.mk... > > So, I was curious to notice that nsplugin seemed to work, and in > comparing the two mk files the following extract from > Executable_pluginapp.bin.mk is the only pertinent difference: >> # the orignal dmakefile said: don't ask, it's ugly >> ifeq ($(OS),SOLARIS) >> $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ >> -z nodefs \ >> )) >> endif > > when I look into gb_Executable_set_ldflags, the problem is in LinkTarget.mk: yes, that looks clearly wrong, when using "set" functions (of which set_ldflags may well be the only one by now, due to their error-prone nature) you have to add the target local variable as well, as in: > $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ > $(T_LDFLAGS) \ > -z nodefs \ > )) >> # call gb_LinkTarget_add_ldflags,linktarget,ldflags >> define gb_LinkTarget_add_ldflags >> $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2) >> >> endef or alternatively use gb_Executable_add_ldflags, which appends to the existing variable and is thus much easier to use. > In summary, the following patch to Executable_pluginapp.bin.mk seems to > build for now (the first part is because motif is, well...:-): apparently the idea there was to always use Motif on Solaris, and the only use of it is: plugcon.hxx: > #if defined SOLARIS > #define USE_MOTIF > #endif > #if defined USE_MOTIF > #include > #else npwrap.cxx: > #if defined USE_MOTIF > "drawingArea", > xmDrawingAreaWidgetClass, > #else > "", > compositeWidgetClass, > #endif if you say that Motif shouldn't be used (and AFAIK you're one of only 2 people that build on Solaris) then we should just remove all of that; likely nobody here knows why it was needed in the past. you can mail a patch to the list, or you can submit it to gerrit, which is very easy to set up: https://wiki.documentfoundation.org/Development/gerrit also, please send a license mail as described on: https://wiki.documentfoundation.org/Development/Developers#Example_Statement >> $ pkgdiff Executable_pluginapp.bin.mk >> $NetBSD$ >> >> --- Executable_pluginapp.bin.mk.orig 2014-04-30 19:49:45.0 + >> +++ Executable_pluginapp.bin.mk >> @@ -33,15 +33,7 @@ $(eval $(call gb_Executable_use_librarie >> sal \ >> )) >> >> -ifeq ($(OS),SOLARIS) >> -$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ >> --lXm \ >> --lXt \ >> --lXext \ >> --lX11 \ >> --ldl \ >> -)) >> -else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) >> +ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) >> $(eval $(call gb_Executable_add_libs,pluginapp.bin,\ >> -lXt \ >> -lXext \ >> @@ -73,7 +65,7 @@ $(eval $(call gb_Executable_use_external >> )) >> >> # the orignal dmakefile said: don't ask, it's ugly ^^^ this is really a particularly unhelpful comment :-/ >> -ifeq ($(OS),SOLARIS) >> +ifeq ($(OS),XSOLARIS) >> $(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ >> -z nodefs \ >> )) > > BTW, for the moment, I don't have an issue with omitting the -znodefs > perhaps an old problem since resolved... will keep an eye out. and indeed looking at the git log there is no hint as to what problem is actually being solved here, so i'd say it's best to remove this block completely if that works for you. regards michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/filter/ww8/ww8par5.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit dc84a2e8c68a02c585433dd22978680b79d15963 Author: LuboÅ¡ LuÅák Date: Fri May 23 11:35:10 2014 +0200 MSWord uses \xb for linebreaks in DB fields (bnc#878854) Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441 (cherry picked from commit d4a19c4098f4556f05666ed92a85c6138b4f769a) Signed-off-by: Andras Timar diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 605f753..d98a046 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2426,6 +2426,8 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr ) pSBase->WW8ReadString( *pStrm, aResult, pPlcxMan->GetCpOfs()+ pF->nSRes, pF->nLRes, eTextCharSet ); +aResult = aResult.replace( '\xb', '\n' ); + aFld.InitContent(aResult); rDoc.InsertPoolItem(*pPaM, SwFmtFld( aFld ), 0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/source
vcl/Library_vcl.mk |1
vcl/source/window/mouse.cxx | 776 +++
vcl/source/window/window.cxx | 727
3 files changed, 777 insertions(+), 727 deletions(-)
New commits:
commit 1cda4728bf668351f25595570592fe112e763cff
Author: Chris Sherlock
Date: Fri May 23 20:39:23 2014 +1000
vcl: move mouse functions from window.cxx to mouse.cxx
Change-Id: I4cd0769cd20869e9316c35ff20e4fa477b5aab16
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7ea6981..3bf8648 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/menu \
vcl/source/window/mnemonic \
vcl/source/window/mnemonicengine \
+vcl/source/window/mouse \
vcl/source/window/mouseevent \
vcl/source/window/event \
vcl/source/window/msgbox \
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
new file mode 100644
index 000..e4503bb
--- /dev/null
+++ b/vcl/source/window/mouse.cxx
@@ -0,0 +1,776 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+
+using namespace ::com::sun::star::uno;
+
+sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
+{
+Point aFramePos( rFramePos );
+if( ImplIsAntiparallel() )
+{
+// - RTL - re-mirror frame pos at this window
+const OutputDevice *pOutDev = GetOutDev();
+pOutDev->ReMirror( aFramePos );
+}
+Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth,
mnOutHeight ) );
+if ( !aRect.IsInside( aFramePos ) )
+return 0;
+if ( mpWindowImpl->mbWinRegion )
+{
+Point aTempPos = aFramePos;
+aTempPos.X() -= mnOutOffX;
+aTempPos.Y() -= mnOutOffY;
+if ( !mpWindowImpl->maWinRegion.IsInside( aTempPos ) )
+return 0;
+}
+
+sal_uInt16 nHitTest = WINDOW_HITTEST_INSIDE;
+if ( mpWindowImpl->mbMouseTransparent )
+nHitTest |= WINDOW_HITTEST_TRANSPARENT;
+return nHitTest;
+}
+
+int Window::ImplTestMousePointerSet()
+{
+// as soon as mouse is captured, switch mouse-pointer
+if ( IsMouseCaptured() )
+return sal_True;
+
+// if the mouse is over the window, switch it
+Rectangle aClientRect( Point( 0, 0 ), GetOutputSizePixel() );
+if ( aClientRect.IsInside( GetPointerPosPixel() ) )
+return sal_True;
+
+return sal_False;
+}
+
+PointerStyle Window::ImplGetMousePointer() const
+{
+PointerStyleePointerStyle;
+boolbWait = false;
+
+if ( IsEnabled() && IsInputEnabled() && ! IsInModalMode() )
+ePointerStyle = GetPointer().GetStyle();
+else
+ePointerStyle = POINTER_ARROW;
+
+const Window* pWindow = this;
+do
+{
+// when the pointer is not visible stop the search, as
+// this status should not be overwritten
+if ( pWindow->mpWindowImpl->mbNoPtrVisible )
+return POINTER_NULL;
+
+if ( !bWait )
+{
+if ( pWindow->mpWindowImpl->mnWaitCount )
+{
+ePointerStyle = POINTER_WAIT;
+bWait = true;
+}
+else
+{
+if ( pWindow->mpWindowImpl->mbChildPtrOverwrite )
+ePointerStyle = pWindow->GetPointer().GetStyle();
+}
+}
+
+if ( pWindow->ImplIsOverlapWindow() )
+break;
+
+pWindow = pWindow->ImplGetParent();
+}
+while ( pWindow );
+
+return ePointerStyle;
+}
+
+void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
+{
+if ( mpWindowImpl->mpFrameData->mbMouseIn &&
mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible )
+{
+sal_uLong nTime = Time::GetSystemTicks();
+longnX = mpWindowImpl->mpFrameData->mnLas
Re: Solaris build
Le 23/05/14 12:34, Michael Stahl a écrit : plugcon.hxx: #if defined SOLARIS #define USE_MOTIF #endif yes, this is already patched out quite a while ago in my test tree as well as the first part of the pluginapp.bin patch.. cheers ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/source
sw/source/filter/ww8/ww8par5.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit c93dd0b7cf4e327ee54cc97efd26461bce30a45c Author: LuboÅ¡ LuÅák Date: Fri May 23 11:35:10 2014 +0200 MSWord uses \xb for linebreaks in DB fields (bnc#878854) Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441 (cherry picked from commit d4a19c4098f4556f05666ed92a85c6138b4f769a) Signed-off-by: Andras Timar diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 8cfdeed..d55cb57 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2546,6 +2546,8 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, String& rStr ) pSBase->WW8ReadString( *pStrm, aResult, pPlcxMan->GetCpOfs()+ pF->nSRes, pF->nLRes, eTextCharSet ); +aResult = aResult.replace( '\xb', '\n' ); + aFld.InitContent(aResult); rDoc.InsertPoolItem(*pPaM, SwFmtFld( aFld ), 0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/source sw/source winaccessibility/source
chart2/source/view/main/GL3DRenderer.cxx | 18 +++---
sw/source/core/access/accdoc.cxx |4 ++--
winaccessibility/source/service/msaaservice_impl.cxx |2 +-
3 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 87e81e4e527044fbc76cdf8f1b8a244093c06bae
Author: Takeshi Abe
Date: Fri May 23 19:51:08 2014 +0900
boost::checked_deleter serves the purpose
Change-Id: I22b4ea752e32b449dcc07b70cc5dc0ba52ad7c45
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 8c0b449..6b96b5f 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -19,6 +19,7 @@
#include
#include "glm/gtc/matrix_inverse.hpp"
+#include
#define DEBUG_FBO 1
@@ -840,19 +841,6 @@ void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo
&polygon)
glUseProgram(0);
}
-namespace {
-
-template< typename T >
-struct DeletePointer
-{
-void operator()(T* p)
-{
-delete p;
-}
-};
-
-}
-
void OpenGL3DRenderer::RenderPolygon3DObject()
{
glDepthMask(GL_FALSE);
@@ -870,9 +858,9 @@ void OpenGL3DRenderer::RenderPolygon3DObject()
RenderPolygon3D(polygon);
}
std::for_each(polygon.verticesList.begin(),
-polygon.verticesList.end(), DeletePointer());
+ polygon.verticesList.end(),
boost::checked_deleter());
std::for_each(polygon.normalsList.begin(),
-polygon.normalsList.end(), DeletePointer());
+ polygon.normalsList.end(),
boost::checked_deleter());
delete polygon.vertices;
delete polygon.normals;
m_Polygon3DInfoList.pop_front();
commit 7e6052f2189168d2eb6c1a2add13b4d8baea8511
Author: Takeshi Abe
Date: Fri May 23 19:48:43 2014 +0900
catch exception by const ref
... redoing 8d52cd0b327e90b555c6beaf29219ba011cc7244
Change-Id: If4935cf5f9adecbc6b42d7440747ae2ba09e9e5a
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index b3016af..7c089b2 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -189,7 +189,7 @@ sal_Int32 SAL_CALL
SwAccessibleDocumentBase::getAccessibleIndexInParent (void)
if( xAcc->getAccessibleChild( i ) == xThis )
return i;
}
-catch(::com::sun::star::lang::IndexOutOfBoundsException)
+catch(const ::com::sun::star::lang::IndexOutOfBoundsException &)
{
return -1L;
}
@@ -253,7 +253,7 @@ awt::Rectangle SAL_CALL
SwAccessibleDocumentBase::getBounds()
return aBox;
}
-catch(::com::sun::star::lang::IndexOutOfBoundsException)
+catch(const ::com::sun::star::lang::IndexOutOfBoundsException &)
{
return awt::Rectangle();
}
commit 74c3aded1a7f61b12a334271ae9c9dafea5e05c4
Author: Takeshi Abe
Date: Fri May 23 19:21:16 2014 +0900
catch exception by const ref
... redoing 0292b4269ec370818bb1ed48222fade636374a4a
Change-Id: Ie869d8cd011cdc64c87363a4c31e6afbd439808c
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx
b/winaccessibility/source/service/msaaservice_impl.cxx
index 408771d..88b78e0 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -187,7 +187,7 @@ static void AccessBridgeHandleExistingWindow(const
Reference< XMSAAService > &xA
}
}
}
-catch (::com::sun::star::uno::RuntimeException)
+catch (::com::sun::star::uno::RuntimeException const&)
{
// Ignore show events that throw DisposedExceptions in
getAccessibleContext(),
// but keep revoking these windows in hide(s).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO 4.3.0 beta1: installation error for pyuno
Hi Jean-Baptiste, On Fri, May 23, 2014 at 6:18 AM, Jean-Baptiste Faure wrote: > >> Décompactage de libobasis4.3-pyuno (4.3.0.0.beta1-1) ... >> dpkg: error processing archive libobasis4.3-pyuno_4.3.0.0.beta1-1_amd64.deb >> (--install): >> tentative de remplacement de « /opt/libreoffice4.3/program/pyuno.so », qui >> appartient aussi au paquet libobasis4.3-core01 4.3.0.0.beta1-1 > > This error message says that when decompressing > libobasis4.3-pyuno_4.3.0.0.beta1-1_amd64.deb, dpkg find > /opt/libreoffice4.3/program/pyuno.so which belongs already to the > package libobasis4.3-core01 4.3.0.0.beta1-1 > As a consequence, pyuno is not installed and the package > libobasis4.3-librelogo can't be installed because it depends on pyuno. > > Is there a problem in the makefile or is the problem on my side ? Bug in the packaging lists. rpm doesn't care when multiple packages have the exact same file, but dpkg fails. use --force-overwrite switch to dpkg to install nevertheless. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hi, On Thursday, 2014-05-22 16:57:34 +0100, Michael Meeks wrote: > + Late features ? > + some changes in language listbox (Eike) >+ switching to a combo-box, so can enter an arbitrary lang_tag > + due today. https://gerrit.libreoffice.org/9447 Please check and vote +1/+2 :-) Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp9_Aupn8Csx.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: SAL_NO_VTABLE in formula
Hi Markus, On Friday, 2014-05-23 03:14:30 +0200, Markus Mohrhard wrote: > so by going through Lsan reports I noted that we have a few classes in > formula that are marked with SAL_NO_VTABLE and therefore have no virtual > protected destructors, This prevents us from deleting some of these > instances and it looks like people just leaked them in the past. What actually leaks, given that these classes have no member variables and only define interfaces as pure abstract base classes one derives from? > Is there any reason not to remove the SAL_NO_VTABLE and make the destructor > virtual and public. I"m talking especially about > include/formula/IFunctionDescription.hxx where the use of SAL_NO_VTABLE > looks like premature optimization to me. This appears to me as exactly what the comment on SAL_NO_VTABLE in include/sal/types.h talks about. But no, if we really leak because of SAL_NO_VTABLE (this is on Windows, isn't it? because it's defined empty for other platforms) then I don't object to remove it, but then we should also remove the SAL_NO_VTABLE define. However, is it a prerequisite to have a non-virtual dtor when using SAL_NO_VTABLE? Or wouldn't adding a virtual to the dtor already solve the problem and not make Lsan stumble about? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpKN9UBzlugG.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cui/source cui/uiconfig include/svtools include/svx svtools/source svx/source
cui/source/inc/chardlg.hxx |2
cui/source/tabpages/chardlg.cxx | 24 ++
cui/uiconfig/ui/charnamepage.ui |4 -
include/svtools/langtab.hxx |1
include/svx/langbox.hxx | 16 ++-
svtools/source/misc/langtab.cxx | 14 ++
svx/source/dialog/langbox.cxx | 90
7 files changed, 147 insertions(+), 4 deletions(-)
New commits:
commit aca222ee87826eb99554dba8fcf22e0cf7c718e0
Author: Eike Rathke
Date: Thu May 22 12:28:02 2014 +0200
switch the Western language list box to SvxLanguageComboBox
This allows the user to assign an arbitrary (but valid) BCP 47 language
tag to a portion of text, so that customized spell-checkers or other
language-dependent tools can be used without the need to wait for
LibreOffice to add yet another language to the list in the next release.
+bool SvtLanguageTable::HasLanguageType()
(cherry picked from commit 2a8eff589a53c8dd65e18d7a9d11cdb98a937e68)
+ SvxLanguageComboBox EditModifyHdl(), SaveEditedAsEntry()
(cherry picked from commit 29c024afbe6a46459e37c5ceec510de1cd0ca7c8)
handle SvxLanguageComboBox edit
(cherry picked from commit 1aad7628dcd7fd14d48814d00c3d04e4ec0c59d5)
finally switch the Western language list box to SvxLanguageComboBox
(cherry picked from commit dbe8b3b6d4f2d2cc2e8c702b78034e9013f71e8f)
advance start of edit selection on a matching entry
... to allow continuous typing.
(cherry picked from commit fe2b8ef18b11b226fddd1cf3fc7f9133426a1b1a)
Change-Id: Id57eb51b69e50be78f85d19a7b3623c1acdf6509
Reviewed-on: https://gerrit.libreoffice.org/9447
Reviewed-by: Miklos Vajna
Reviewed-by: Björn Michaelsen
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index d90c2cb..69b46c8 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -86,7 +86,7 @@ private:
FixedText* m_pWestFontSizeFT;
FontSizeBox*m_pWestFontSizeLB;
FixedText* m_pWestFontLanguageFT;
-SvxLanguageBox* m_pWestFontLanguageLB;
+SvxLanguageComboBox* m_pWestFontLanguageLB;
FixedText* m_pWestFontTypeFT;
VclContainer* m_pEastFrame;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1f0e58560..f36ae8e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1086,6 +1086,30 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet&
rSet, LanguageGroup eLangGrp
}
nWhich = GetWhich( nSlot );
pOld = GetOldItem( rSet, nSlot );
+
+// For language list boxes acting as ComboBox, check for, add and select an
+// edited entry.
+SvxLanguageComboBox* pLangComboBox =
dynamic_cast(pLangBox);
+if (pLangComboBox)
+{
+switch (pLangComboBox->GetEditedAndValid())
+{
+case SvxLanguageComboBox::EDITED_NO:
+; // nothing to do
+break;
+case SvxLanguageComboBox::EDITED_VALID:
+{
+const sal_Int32 nPos = pLangComboBox->SaveEditedAsEntry();
+if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+pLangComboBox->SelectEntryPos( nPos);
+}
+break;
+case SvxLanguageComboBox::EDITED_INVALID:
+pLangComboBox->SelectEntryPos(
pLangComboBox->GetSavedValueLBB());
+break;
+}
+}
+
sal_Int32 nLangPos = pLangBox->GetSelectEntryPosLBB();
LanguageType eLangType =
(LanguageType)(sal_uLong)pLangBox->GetEntryDataLBB( nLangPos );
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 25c67f1..6205dfd 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -54,7 +54,7 @@
-
+
True
False
start
@@ -342,7 +342,7 @@
-
+
True
False
True
diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 0034873..56d0618 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -29,6 +29,7 @@ class SVT_DLLPUBLIC SvtLanguageTable
{
public:
+static bool HasLanguageType( const LanguageType eType );
static OUString GetLanguageString( const LanguageType eType );
static LanguageType GetLanguageType( const OUString& rStr );
static sal_uInt32 GetLanguageEntryCount();
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 410b240..91b788c 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -144,8 +144,20 @@ publi
[Libreoffice-commits] core.git: 2 commits - include/sfx2 lingucomponent/source sfx2/source
include/sfx2/objsh.hxx|8
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |5 +
sfx2/source/doc/objmisc.cxx |8
3 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 8928a4f6dcacb1357d3b9b1a7a29cc62fede87d9
Author: Tor Lillqvist
Date: Fri May 23 14:29:50 2014 +0300
Try to fix Windows build
Change-Id: Ib73cc86f9f14397b296324e14562278b5f8a2144
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 94abeb9..72fd23d 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -17,6 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#if defined(WNT)
+#include
+#include
+#endif
+
#include
#include
commit 43bea0e2f77bb2de9ca4d74f2f1f401e857b7178
Author: Tor Lillqvist
Date: Fri May 23 13:39:15 2014 +0300
Avoid including in
Change-Id: I36969367e47c1ed1368ed46638ff9e7768e8a008
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 79082aa..9c28cc5 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SFX2_OBJSH_HXX
#define INCLUDED_SFX2_OBJSH_HXX
-#include
#include
#include
#include
@@ -256,7 +255,6 @@ public:
virtual boolAcceptStateUpdate() const;
boolIsHelpDocument() const;
-#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
boolIsDocShared() const;
OUStringGetSharedFileURL() const;
boolSwitchToShared( bool bShared, bool bSave );
@@ -265,12 +263,6 @@ public:
SAL_DLLPRIVATE void DoNotCleanShareControlFile();
voidSetSharedXMLFlag( bool bFlag ) const;
boolHasSharedXMLFlagSet() const;
-#else
-boolIsDocShared() const
-{ return sal_False; };
-OUString GetSharedFileURL() const
-{ return OUString(); };
-#endif
SAL_DLLPRIVATE void SetModalMode_Impl(bool bModal=true);
SAL_DLLPRIVATE void SetMacroMode_Impl(bool bModal=true);
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 070703e..0e825c4 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -673,14 +673,22 @@ bool SfxObjectShell::HasSharedXMLFlagSet() const
bool SfxObjectShell::IsDocShared() const
{
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
return ( !pImp->m_aSharedFileURL.isEmpty() );
+#else
+return false;
+#endif
}
OUString SfxObjectShell::GetSharedFileURL() const
{
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
return pImp->m_aSharedFileURL;
+#else
+return OUString();
+#endif
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cli_ure/source codemaker/source cppuhelper/source include/unoidl unoidl/README unoidl/source
cli_ure/source/climaker/climaker_app.cxx |6 --
codemaker/source/codemaker/typemanager.cxx |4 -
cppuhelper/source/typemanager.cxx |2
include/unoidl/unoidl.hxx | 10 ++--
unoidl/README |4 -
unoidl/source/legacyprovider.cxx |7 +--
unoidl/source/legacyprovider.hxx |5 --
unoidl/source/sourcetreeprovider.cxx |5 --
unoidl/source/sourcetreeprovider.hxx |5 --
unoidl/source/unoidl-check.cxx |3 -
unoidl/source/unoidl-read.cxx |3 -
unoidl/source/unoidl-write.cxx |3 -
unoidl/source/unoidl.cxx | 60 ++---
13 files changed, 54 insertions(+), 63 deletions(-)
New commits:
commit 8949bcad4095008dc147c6fd6e633c177144dfa8
Author: Stephan Bergmann
Date: Fri May 23 13:43:40 2014 +0200
Remove circular references between unoidl::Manager and its providers
Change-Id: Ic6ad3e2c7f69dd123077a913f35f1971f1e8ca13
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index ac8ec69..9db8495 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -778,8 +778,7 @@ rtl::Reference< Entity > readEntity(
}
-LegacyProvider::LegacyProvider(
-rtl::Reference< Manager > const & manager, OUString const & uri):
+LegacyProvider::LegacyProvider(Manager & manager, OUString const & uri):
manager_(manager)
{
Registry reg;
@@ -811,14 +810,14 @@ LegacyProvider::LegacyProvider(
}
rtl::Reference< MapCursor > LegacyProvider::createRootCursor() const {
-return new Cursor(manager_, ucr_, ucr_);
+return new Cursor(&manager_, ucr_, ucr_);
}
rtl::Reference< Entity > LegacyProvider::findEntity(OUString const & name)
const
{
return ucr_.isValid()
-? readEntity(manager_, ucr_, ucr_, name.replace('.', '/'), true)
+? readEntity(&manager_, ucr_, ucr_, name.replace('.', '/'), true)
: rtl::Reference< Entity >();
}
diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx
index bcb300d..c3ba6ef 100644
--- a/unoidl/source/legacyprovider.hxx
+++ b/unoidl/source/legacyprovider.hxx
@@ -21,8 +21,7 @@ namespace unoidl { namespace detail {
class LegacyProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
-LegacyProvider(
-rtl::Reference< Manager > const & manager, OUString const & uri);
+LegacyProvider(Manager & manager, OUString const & uri);
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createRootCursor() const SAL_OVERRIDE;
@@ -34,7 +33,7 @@ public:
private:
virtual ~LegacyProvider() throw ();
-rtl::Reference< Manager > manager_;
+Manager & manager_;
mutable RegistryKey ucr_;
};
diff --git a/unoidl/source/sourcetreeprovider.cxx
b/unoidl/source/sourcetreeprovider.cxx
index 5c203e4..246f6f0 100644
--- a/unoidl/source/sourcetreeprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -120,8 +120,7 @@ private:
}
-SourceTreeProvider::SourceTreeProvider(
-rtl::Reference const & manager, OUString const & uri):
+SourceTreeProvider::SourceTreeProvider(Manager & manager, OUString const &
uri):
manager_(manager), uri_(uri.endsWith("/") ? uri : uri + "/")
{}
@@ -189,7 +188,7 @@ rtl::Reference
SourceTreeProvider::findEntity(OUString const & name)
ent = new SourceModuleEntity;
} else {
uri += ".idl";
-SourceProviderScannerData data(manager_);
+SourceProviderScannerData data(&manager_);
if (parse(uri, &data)) {
std::map::const_iterator j(
data.entities.find(name));
diff --git a/unoidl/source/sourcetreeprovider.hxx
b/unoidl/source/sourcetreeprovider.hxx
index 57ae3d5..0c1d993 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -22,8 +22,7 @@ namespace unoidl { namespace detail {
class SourceTreeProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
-SourceTreeProvider(
-rtl::Reference const & manager, OUString const & uri);
+SourceTreeProvider(Manager & manager, OUString const & uri);
// throws FileFormatException:
virtual rtl::Reference createRootCursor() const SAL_OVERRIDE;
@@ -34,7 +33,7 @@ public:
private:
virtual ~SourceTreeProvider() throw ();
-rtl::Reference manager_;
+Manager & manager_;
OUString uri_;
mutable std::map< OUString, rtl::Reference > cache_; //TODO: at
manager
};
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index 4546383..e5573f0 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -206,7 +206,7 @@ rtl::Reference< Provider > Manager::loadProvider(OUString
const & uri) {
if (item.getFileStatus(status) == osl::FileBase::E_None
&& status.getFileType() == osl::FileStatus:
Re: SAL_NO_VTABLE in formula
Hey, On Fri, May 23, 2014 at 1:24 PM, Eike Rathke wrote: > Hi Markus, > > On Friday, 2014-05-23 03:14:30 +0200, Markus Mohrhard wrote: > > > so by going through Lsan reports I noted that we have a few classes in > > formula that are marked with SAL_NO_VTABLE and therefore have no virtual > > protected destructors, This prevents us from deleting some of these > > instances and it looks like people just leaked them in the past. > > What actually leaks, given that these classes have no member variables > and only define interfaces as pure abstract base classes one derives > from? > There is code in formula which generates objects from sc but can of course only use the abstract interfaces. Instead of deleting the objects we just leak them after use because the d'tor is protected. > > > Is there any reason not to remove the SAL_NO_VTABLE and make the > destructor > > virtual and public. I"m talking especially about > > include/formula/IFunctionDescription.hxx where the use of SAL_NO_VTABLE > > looks like premature optimization to me. > > This appears to me as exactly what the comment on SAL_NO_VTABLE in > include/sal/types.h talks about. > The main question is if it really makes a difference. I understand that it makes a difference for objects where we create thousands or more but these classes seem to generate just a few objects. > > But no, if we really leak because of SAL_NO_VTABLE (this is on Windows, > isn't it? because it's defined empty for other platforms) then I don't > object to remove it, but then we should also remove the SAL_NO_VTABLE > define. > > However, is it a prerequisite to have a non-virtual dtor when using > SAL_NO_VTABLE? Or wouldn't adding a virtual to the dtor already solve > the problem and not make Lsan stumble about? > How can you use a virtual destructor when you don't have a v-table? As far as my understanding goes the destructors are protected and non-virtual because you can't have a virtual destructor and should not be able to delete the objects through the base class. So the question from my point of view is more if it there is really a good reason to save these few bytes per object? Personally I would not worry about the space a v-table allocates until I'm really desperate and don't have any other place to optimize. Regards, Markus > > Eike > > -- > LibreOffice Calc developer. Number formatter stricken i18n > transpositionizer. > GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A > Support the FSFE, care about Free Software! > https://fsfe.org/support/?erack > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79116] make paste special easier to use
https://bugs.freedesktop.org/show_bug.cgi?id=79116 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #1 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 76758] Test Bibi-GUI
https://bugs.freedesktop.org/show_bug.cgi?id=76758 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #2 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 78826] UI: inconsistent fields labeling. "Text:" or "Text"?
https://bugs.freedesktop.org/show_bug.cgi?id=78826 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #11 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 77546] QA: Create introductory video
https://bugs.freedesktop.org/show_bug.cgi?id=77546 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #2 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 77255] Make BundesGit for LibreOffice work on Windows
https://bugs.freedesktop.org/show_bug.cgi?id=77255 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #1 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 78828] Insert Snap Point/Line: images are one pixel too tall
https://bugs.freedesktop.org/show_bug.cgi?id=78828 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #3 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 78920] "Number %NUMBERINGSAMPLE" in tooltip
https://bugs.freedesktop.org/show_bug.cgi?id=78920 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #2 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 76291] FILESAVE: Chinese hyperlinks modified upon Saving
https://bugs.freedesktop.org/show_bug.cgi?id=76291 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #3 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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 78793] Make hiding the gallery easier ...
https://bugs.freedesktop.org/show_bug.cgi?id=78793 Björn Michaelsen changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org --- Comment #2 from Björn Michaelsen --- adding LibreOffice developer list as CC to unresolved EasyHacks for better visibility. see e.g. http://nabble.documentfoundation.org/minutes-of-ESC-call-td4076214.html for details -- 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: SAL_NO_VTABLE in formula
On 05/23/2014 01:47 PM, Markus Mohrhard wrote: On Fri, May 23, 2014 at 1:24 PM, Eike Rathke mailto:er...@redhat.com>> wrote: On Friday, 2014-05-23 03:14:30 +0200, Markus Mohrhard wrote: > so by going through Lsan reports I noted that we have a few classes in > formula that are marked with SAL_NO_VTABLE and therefore have no virtual > protected destructors, This prevents us from deleting some of these > instances and it looks like people just leaked them in the past. What actually leaks, given that these classes have no member variables and only define interfaces as pure abstract base classes one derives from? There is code in formula which generates objects from sc but can of course only use the abstract interfaces. Instead of deleting the objects we just leak them after use because the d'tor is protected. If client code wants to polymorphically delete through IFunctionDescription (which I understand it does), then IFunctionDescription of course needs a public virtual dtor. Whether or not to decorate IFunctionDescription with __declspec(novtable) (AKA SAL_NO_VTABLE) on Windows should be an orthogonal decision (at least, that's my---poor, as it is about Windows after all---understanding of __declspec(novtable)). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/refactor-god-objects' - 2 commits - sw/inc sw/source
sw/inc/doc.hxx| 89 -- sw/source/core/doc/DocumentSettingManager.cxx | 27 +++- sw/source/core/doc/doc.cxx|8 - sw/source/core/doc/docdraw.cxx|2 sw/source/core/doc/docnew.cxx | 16 -- sw/source/core/docnode/node.cxx |2 sw/source/core/inc/DocumentSettingManager.hxx | 67 ++ sw/source/core/uibase/app/docsh.cxx | 14 +- sw/source/core/uibase/app/docsh2.cxx |8 - sw/source/core/uibase/app/docshini.cxx|8 - sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx |2 sw/source/core/uibase/lingu/sdrhhcwrap.cxx|2 sw/source/core/uibase/misc/glshell.cxx|4 sw/source/core/uibase/uiview/srcview.cxx |4 sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 12 - sw/source/core/uibase/uno/unomod.cxx |4 sw/source/core/uibase/uno/unotxdoc.cxx|8 - sw/source/core/unocore/unostyle.cxx |8 - sw/source/core/view/printdata.cxx |2 sw/source/core/view/viewsh.cxx|6 sw/source/core/view/vnew.cxx |4 sw/source/core/view/vprint.cxx|2 sw/source/filter/ascii/parasc.cxx |4 sw/source/filter/basflt/shellio.cxx |4 sw/source/filter/ww8/wrtww8.cxx |5 sw/source/filter/ww8/ww8par.cxx |5 sw/source/filter/xml/xmlimp.cxx |2 sw/source/ui/dialog/ascfldlg.cxx |2 28 files changed, 159 insertions(+), 162 deletions(-) New commits: commit 8a4911d8c2aa5b45462569d0e42fc2d8e69d4b43 Author: Valentin Kettner Date: Fri May 23 14:43:48 2014 +0200 Work on DocumentSettingManager for SwDoc. Moved mn32DummyCompatabilityOptions1 from SwDoc to DocumentSettingManager and moved a comment from SwDoc to it. Change-Id: I4abd5cd9596d23dc3ac12460ee9b38345d0bf0a7 diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 87e008f..21bb0b0 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -463,73 +463,6 @@ private: // Thus, certain adjustment needed during formatting for these kind of anchored objects. bool mbContainsAtPageObjWithContentAnchor : 1; -// COMPATIBILITY FLAGS START -// -// -// HISTORY OF THE COMPATIBILITY FLAGS: -// -// SO5: -// mbParaSpaceMaxdef = sal_False, sal_True since SO8 -// mbParaSpaceMaxAtPages def = sal_False, sal_True since SO8 -// -// SO6: -// mbTabCompat def = sal_False, sal_True since SO8 -// -// SO7: -// mbUseVirtualDevicedef = sal_True -// mbAddFlyOffsets def = sal_False, hidden -// -// SO7pp1: -// bOldNumberingdef = sal_False, hidden -// -// SO8: -// mbAddExternalLeading def = sal_True -// mbUseHiResolutionVirtualDevicedef = sal_True, hidden -// mbOldLineSpacing def = sal_False -// mbAddParaSpacingToTableCells def = sal_True -// mbUseFormerObjectPos def = sal_False -// mbUseFormerTextWrapping def = sal_False -// mbConsiderWrapOnObjPosdef = sal_False -// -// SO8pp1: -// mbIgnoreFirstLineIndentInNumberingdef = sal_False, hidden -// mbDoNotJustifyLinesWithManualBreakdef = sal_False, hidden -// mbDoNotResetParaAttrsForNumFont def = sal_False, hidden -// -// SO8pp3 -// mbDoNotCaptureDrawObjsOnPage def = sal_False, hidden -// - Relevant for drawing objects, which don't follow the text flow, but -// whose position is outside the page area: -// sal_False: Such drawing objects are captured on the page area of its anchor. -// sal_True: Such drawing objects can leave the page area, they aren't captured. -// mbTableRowKeepdef = sal_False, hidden -// mbIgnoreTabsAndBlanksForLineCalculation def = sal_False, hidden -// mbClipAsCharacterAnchoredWriterFlyFrame def = sal_False, hidden -// - Introduced in order to re-activate clipping of as-character anchored -// Writer fly frames in method for documents, -// which are created with version prior SO8/OOo 2.0 -// -// SO8pp4 -// mbUnixForceZeroExtLeadingdef = sal_False, hidden -// -// SO8pu8 -// mbOldPrinterMetrics def = sal_False, hidden -// -// SO9 -// #i24363# t
[Libreoffice-commits] core.git: Branch 'feature/fastsax' - sc/source
sc/source/filter/xml/xmlwrap.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d824ea5c012eaae538845deef0b4e3f0144d9dbd
Author: Michael Meeks
Date: Fri May 23 13:55:29 2014 +0100
Fix compile issues; squash before merge.
Change-Id: Icbedc2ce374614ba371e75524bee8e70d3ae0bf6
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index cb5fd28..b6c5be2 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -469,8 +470,7 @@ public:
// The SAX-Parser-Interface
virtual void SAL_CALL parseStream( const css::xml::sax::InputSource&
structSource)
-throw ( css::xml::sax::SAXException,
-IOException,
+throw ( css::xml::sax::SAXException, css::io::IOException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
mxFastParser->parseStream(structSource);
@@ -484,35 +484,35 @@ public:
new XFastHandlerWrapper( xHandler ) );
else
mxHandler.clear();
-mxFastParser->setFastDocumentHandler(xHandle);
+mxFastParser->setFastDocumentHandler(mxHandler);
}
-virtual void SAL_CALL setErrorHandler(const css::uno::Reference<
XErrorHandler > & xHandler)
+virtual void SAL_CALL setErrorHandler(const css::uno::Reference<
xml::sax::XErrorHandler > & xHandler)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
mxFastParser->setErrorHandler(xHandler);
}
-virtual void SAL_CALL setDTDHandler(const css::uno::Reference <
XDTDHandler > & xHandler)
+virtual void SAL_CALL setDTDHandler(const css::uno::Reference <
xml::sax::XDTDHandler > & /* xHandler */)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
-mxFastParser->setDTDHandler(xHandler);
+assert(false);
}
-virtual void SAL_CALL setEntityResolver(const css::uno::Reference<
XEntityResolver >& xResolver)
+virtual void SAL_CALL setEntityResolver(const css::uno::Reference<
xml::sax::XEntityResolver >& xResolver)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
mxFastParser->setEntityResolver(xResolver);
}
-virtual void SAL_CALL setLocale( const Locale &locale )
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+virtual void SAL_CALL setLocale( const lang::Locale &locale )
+throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
mxFastParser->setLocale(locale);
}
};
-
-bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode& nError)
+bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError )
{
uno::Reference xContext =
comphelper::getProcessComponentContext();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO 4.3.0 beta1: installation error for pyuno
Le 23/05/2014 12:59, Christian Lohmaier a écrit : > Hi Jean-Baptiste, > [...] > Bug in the packaging lists. rpm doesn't care when multiple packages > have the exact same file, but dpkg fails. > > use --force-overwrite switch to dpkg to install nevertheless. That works. Thank you very much :-) Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/paint.cxx | 1363
1 file changed, 1363 insertions(+)
New commits:
commit e76dc5b422084f68cc4b27eea4cdbef3d3e7a1a9
Author: Chris Sherlock
Date: Fri May 23 23:12:37 2014 +1000
vcl: add paint.cxx
Change-Id: I1ab01c1acec9147812841c1deee17413cee88962
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
new file mode 100644
index 000..18fab8a
--- /dev/null
+++ b/vcl/source/window/paint.cxx
@@ -0,0 +1,1363 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+
+#define IMPL_PAINT_PAINT((sal_uInt16)0x0001)
+#define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002)
+#define IMPL_PAINT_PAINTALLCHILDREN ((sal_uInt16)0x0004)
+#define IMPL_PAINT_PAINTCHILDREN ((sal_uInt16)0x0008)
+#define IMPL_PAINT_ERASE((sal_uInt16)0x0010)
+#define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020)
+
+
+class PaintHelper
+{
+private:
+Window* m_pWindow;
+Region* m_pChildRegion;
+Rectangle m_aSelectionRect;
+Rectangle m_aPaintRect;
+Region m_aPaintRegion;
+sal_uInt16 m_nPaintFlags;
+bool m_bPop;
+bool m_bRestoreCursor;
+public:
+PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags);
+void SetPop()
+{
+m_bPop = true;
+}
+void SetPaintRect(const Rectangle& rRect)
+{
+m_aPaintRect = rRect;
+}
+void SetSelectionRect(const Rectangle& rRect)
+{
+m_aSelectionRect = rRect;
+}
+void SetRestoreCursor(bool bRestoreCursor)
+{
+m_bRestoreCursor = bRestoreCursor;
+}
+bool GetRestoreCursor() const
+{
+return m_bRestoreCursor;
+}
+sal_uInt16 GetPaintFlags() const
+{
+return m_nPaintFlags;
+}
+Region& GetPaintRegion()
+{
+return m_aPaintRegion;
+}
+void DoPaint(const Region* pRegion);
+~PaintHelper();
+};
+
+PaintHelper::PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags)
+: m_pWindow(pWindow)
+, m_pChildRegion(NULL)
+, m_nPaintFlags(nPaintFlags)
+, m_bPop(false)
+, m_bRestoreCursor(false)
+{
+}
+
+void PaintHelper::DoPaint(const Region* pRegion)
+{
+WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
+Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
+if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL )
+pWindowImpl->maInvalidateRegion = *pWinChildClipRegion;
+else
+{
+if ( pRegion )
+pWindowImpl->maInvalidateRegion.Union( *pRegion );
+
+if( pWindowImpl->mpWinData && pWindowImpl->mbTrackVisible )
+/* #98602# need to repaint all children within the
+ * tracking rectangle, so the following invert
+ * operation takes places without traces of the previous
+ * one.
+ */
+pWindowImpl->maInvalidateRegion.Union(
*pWindowImpl->mpWinData->mpTrackRect );
+
+if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALLCHILDREN )
+m_pChildRegion = new Region( pWindowImpl->maInvalidateRegion );
+pWindowImpl->maInvalidateRegion.Intersect( *pWinChildClipRegion );
+}
+pWindowImpl->mnPaintFlags = 0;
+if ( !pWindowImpl->maInvalidateRegion.IsEmpty() )
+{
+m_pWindow->PushPaintHelper(this);
+m_pWindow->Paint(m_aPaintRect);
+}
+}
+
+void Window::PushPaintHelper(PaintHelper *pHelper)
+{
+pHelper->SetPop();
+
+if ( mpWindowImpl->mpCursor )
+pHelper->SetRestoreCursor(mpWindowImpl->mpCursor->ImplSuspend());
+
+mbInitClipRegion = true;
+mpWindowImpl->mbInPaint = true;
+
+// restore Paint-Region
+Region &rPaintRegion = pHelper->GetPaintRegion();
+rPaintRegion = mpWindowImpl->maInvalidateRegion;
+Rectangle aPaintRect = rPaintRegion.GetBoundRect();
+
+// - RTL - re-mirror paint rect and region at this window
+if( ImplIsAntiparallel() )
+{
+const OutputDevice *pOutDev = GetOutDev();
+pOutDev->ReMirror( aPain
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 68ec7f482812da5534844028915d4e376af39e50
Author: Kohei Yoshida
Date: Fri May 23 09:35:39 2014 -0400
Forgot to remove debug statements.
Change-Id: I7653efc19bf590bb5456128b270dd1d59c974599
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 38f7a3b..d8f1437 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1373,7 +1373,6 @@ void Test::testFormulaDepTrackingDeleteRow()
// A4 should have a broadcaster with A5 listening to it.
SvtBroadcaster* pBC = m_pDoc->GetBroadcaster(ScAddress(0,4,0));
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: broadcaster at
A5 = %p\n", pBC);
CPPUNIT_ASSERT(pBC);
SvtBroadcaster::ListenersType* pListeners = &pBC->GetAllListeners();
CPPUNIT_ASSERT_MESSAGE("A5 should have one listener.", pListeners->size()
== 1);
@@ -1384,16 +1383,13 @@ void Test::testFormulaDepTrackingDeleteRow()
CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc->GetValue(ScAddress(0,4,0)));
CPPUNIT_ASSERT_EQUAL(90.0, m_pDoc->GetValue(ScAddress(0,5,0)));
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: Deleting row
2\n");
// Delete row 2.
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true,
true);
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: Done deleting
row 2.\n");
pBC = m_pDoc->GetBroadcaster(ScAddress(0,3,0));
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: broadcaster at
A4 = %p\n", pBC);
CPPUNIT_ASSERT_MESSAGE("Broadcaster at A5 should have shifted to A4.",
pBC);
pListeners = &pBC->GetAllListeners();
CPPUNIT_ASSERT_MESSAGE("A3 should have one listener.", pListeners->size()
== 1);
___
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' - sc/qa
sc/qa/unit/ucalc.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 959a17b9c2a2afac9946be44beb646c273311887
Author: Kohei Yoshida
Date: Fri May 23 09:35:39 2014 -0400
Forgot to remove debug statements.
Change-Id: I7653efc19bf590bb5456128b270dd1d59c974599
(cherry picked from commit 68ec7f482812da5534844028915d4e376af39e50)
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 38f7a3b..d8f1437 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1373,7 +1373,6 @@ void Test::testFormulaDepTrackingDeleteRow()
// A4 should have a broadcaster with A5 listening to it.
SvtBroadcaster* pBC = m_pDoc->GetBroadcaster(ScAddress(0,4,0));
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: broadcaster at
A5 = %p\n", pBC);
CPPUNIT_ASSERT(pBC);
SvtBroadcaster::ListenersType* pListeners = &pBC->GetAllListeners();
CPPUNIT_ASSERT_MESSAGE("A5 should have one listener.", pListeners->size()
== 1);
@@ -1384,16 +1383,13 @@ void Test::testFormulaDepTrackingDeleteRow()
CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc->GetValue(ScAddress(0,4,0)));
CPPUNIT_ASSERT_EQUAL(90.0, m_pDoc->GetValue(ScAddress(0,5,0)));
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: Deleting row
2\n");
// Delete row 2.
ScDocFunc& rFunc = getDocShell().GetDocFunc();
ScMarkData aMark;
aMark.SelectOneTable(0);
rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DEL_CELLSUP, true,
true);
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: Done deleting
row 2.\n");
pBC = m_pDoc->GetBroadcaster(ScAddress(0,3,0));
-fprintf(stdout, "Test::testFormulaDepTrackingDeleteRow: broadcaster at
A4 = %p\n", pBC);
CPPUNIT_ASSERT_MESSAGE("Broadcaster at A5 should have shifted to A4.",
pBC);
pListeners = &pBC->GetAllListeners();
CPPUNIT_ASSERT_MESSAGE("A3 should have one listener.", pListeners->size()
== 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gerrit-etc branches and documentation
Hi there, There are a few patches waiting on gerrit about gerrits configuration itself: https://gerrit.libreoffice.org/#/q/status:open+project:gerrit-etc,n,z Now the gerrit-etc project has some specific branch setup that I dont understand, with a prod and a master branch and some patches on each that are not on the other AFAIK. @Norbert, David: Can you please set up a wiki page describing the recommended way to get things in there? Or alternatively, put a big fat "README" file in the root of the repo doing that? Thanks. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/txtnode/txtedt.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit a79b8bb279357f9a81fd8bb11a6b2c2be07f5d7a Author: Oliver-Rainer Wittmann Date: Fri May 23 12:23:40 2014 + 124877: method - correct refactoring (made for issue 123389) causing serious endless loop diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index febb5c8..5d0d831 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -640,8 +640,9 @@ void SwTxtNode::RstTxtAttr( } } } -++i; } + +++i; } TryDeleteSwpHints(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79123] Autoabandon gerrit changes with negative feedback and more than 1 month without action
https://bugs.freedesktop.org/show_bug.cgi?id=79123 Björn Michaelsen changed: What|Removed |Added Status|UNCONFIRMED |NEW Whiteboard||EasyHack DifficultyBeginner ||SkillScript TopicWeb CC||libreoffice@lists.freedeskt ||op.org Ever confirmed|0 |1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a7/9b8bb279357f9a81fd8bb11a6b2c2be07f5d7a
a7/9b8bb279357f9a81fd8bb11a6b2c2be07f5d7a |1 + 1 file changed, 1 insertion(+) New commits: commit 05a649209660d131859ec59d56648f21f8c084a5 Author: Michael Stahl Date: Fri May 23 16:11:38 2014 +0200 Notes added by 'git notes add' diff --git a/a7/9b8bb279357f9a81fd8bb11a6b2c2be07f5d7a b/a7/9b8bb279357f9a81fd8bb11a6b2c2be07f5d7a new file mode 100644 index 000..bddae90 --- /dev/null +++ b/a7/9b8bb279357f9a81fd8bb11a6b2c2be07f5d7a @@ -0,0 +1 @@ +prefer: 8c59c30153b8a67d9455d70a66b4a42c35120f97 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/Library_msword.mk sw/source
sw/Library_msword.mk |1 -
sw/inc/frmfmt.hxx |2 ++
sw/source/core/layout/atrfrm.cxx | 25 +
sw/source/filter/ww8/wrtw8esh.cxx | 29 +
4 files changed, 28 insertions(+), 29 deletions(-)
New commits:
commit 974492a0a02ade14d1ed300016fdf3be8ceef12e
Author: Michael Stahl
Date: Fri May 23 16:07:38 2014 +0200
sw: try not to include sw/souce/core stuff from sw/source/filter
Change-Id: I21f1de79ed0a6df73afc53d1c93450f9eef23ac6
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 92e806d..ca49750 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_custom_headers,msword,\
$(eval $(call
gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword))
$(eval $(call gb_Library_set_include,msword,\
--I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/inc \
$$(INCLUDE) \
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 03bda2e..1b063ff 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -295,6 +295,8 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt);
};
+SW_DLLPUBLIC bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt);
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a829e74..583ccc7 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3304,4 +3304,29 @@ FillAttributesPtr SwFrmFmt::getFillAttributes() const
return maFillAttributes;
}
+bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt)
+{
+const SwFlyFrmFmt* pFlyFrmFmt = dynamic_cast(&rFmt);
+if (!pFlyFrmFmt)
+return false;
+SwFlyFrm* pFlyFrm = const_cast(pFlyFrmFmt->GetFrm());
+if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame
+{
+return false;
+}
+SwPageFrm* pPageFrm = pFlyFrm->FindPageFrmOfAnchor();
+SwFrm* pHeader = pPageFrm->Lower();
+if (pHeader->GetType() == FRM_HEADER)
+{
+const SwFrm* pFrm = pFlyFrm->GetAnchorFrm();
+while (pFrm)
+{
+if (pFrm == pHeader)
+return true;
+pFrm = pFrm->GetUpper();
+}
+}
+return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 858a721..a5bf48a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -58,8 +58,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -1893,31 +1891,6 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem
&rBrush,
}
}
-static bool lcl_isInHeader(const SwFrmFmt& rFmt)
-{
-const SwFlyFrmFmt* pFlyFrmFmt = dynamic_cast(&rFmt);
-if (!pFlyFrmFmt)
-return false;
-SwFlyFrm* pFlyFrm = const_cast(pFlyFrmFmt->GetFrm());
-if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame
-{
-return false;
-}
-SwPageFrm* pPageFrm = pFlyFrm->FindPageFrmOfAnchor();
-SwFrm* pHeader = pPageFrm->Lower();
-if (pHeader->GetType() == FRM_HEADER)
-{
-const SwFrm* pFrm = pFlyFrm->GetAnchorFrm();
-while (pFrm)
-{
-if (pFrm == pHeader)
-return true;
-pFrm = pFrm->GetUpper();
-}
-}
-return false;
-}
-
sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
MSO_SPT eShapeType, EscherPropertyContainer& rPropOpt)
{
@@ -2061,7 +2034,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const
SwFrmFmt& rFmt,
// SwWW8ImplReader::Read_GrafLayer() imports these as opaque
// unconditionally, so if both are true, don't export the property.
-bool bIsInHeader = lcl_isInHeader(rFmt);
+bool bIsInHeader = IsFlyFrmFmtInHeader(rFmt);
bool bIsThrought = rFmt.GetSurround().GetValue() == SURROUND_THROUGHT;
if (bIsInHeader)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4b/def485997f44c1acf786232327ed6901c60f63
4b/def485997f44c1acf786232327ed6901c60f63 |1 + 1 file changed, 1 insertion(+) New commits: commit a9dbed416d4d119c7146eeba91b91bbeaf6dc78e Author: Caolán McNamara Date: Fri May 23 15:16:32 2014 +0100 Notes added by 'git notes add' diff --git a/4b/def485997f44c1acf786232327ed6901c60f63 b/4b/def485997f44c1acf786232327ed6901c60f63 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/4b/def485997f44c1acf786232327ed6901c60f63 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 84/70308050cb5c71262fdf67ec689d628c9558e8
84/70308050cb5c71262fdf67ec689d628c9558e8 |1 + 1 file changed, 1 insertion(+) New commits: commit 45699d1c182bc54e4a5dfd0bac12126896a8b282 Author: Caolán McNamara Date: Fri May 23 15:19:07 2014 +0100 Notes added by 'git notes add' diff --git a/84/70308050cb5c71262fdf67ec689d628c9558e8 b/84/70308050cb5c71262fdf67ec689d628c9558e8 new file mode 100644 index 000..a4ea74d --- /dev/null +++ b/84/70308050cb5c71262fdf67ec689d628c9558e8 @@ -0,0 +1 @@ +prefer: 21334f74a53197c32863fdf3d7e6f365f1b868b7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
116 --
1 file changed, 97 insertions(+), 19 deletions(-)
New commits:
commit f13e5b284598ee5eb855c19bc7e02ba7e2d1af1a
Author: Tor Lillqvist
Date: Thu May 22 15:47:43 2014 +0300
Add some more source files for debugging convenience
Change-Id: Ic058067f4114662569433801d8627e1c6fe648aa
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 60c0e6e..3872449 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -50,7 +50,6 @@
BE0898EE1860D42B0021A679 /* salvtables.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
salvtables.cxx; path = ../../../vcl/source/app/salvtables.cxx; sourceTree =
""; };
BE0898EF1860D42B0021A679 /* session.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = session.cxx;
path = ../../../vcl/source/app/session.cxx; sourceTree = ""; };
BE0898F01860D42B0021A679 /* settings.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settings.cxx;
path = ../../../vcl/source/app/settings.cxx; sourceTree = ""; };
- BE0898F11860D42B0021A679 /* solarmutex.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
solarmutex.cxx; path = ../../../vcl/source/app/solarmutex.cxx; sourceTree =
""; };
BE0898F21860D42B0021A679 /* sound.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound.cxx;
path = ../../../vcl/source/app/sound.cxx; sourceTree = ""; };
BE0898F31860D42B0021A679 /* stdtext.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdtext.cxx;
path = ../../../vcl/source/app/stdtext.cxx; sourceTree = ""; };
BE0898F41860D42B0021A679 /* svapp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svapp.cxx;
path = ../../../vcl/source/app/svapp.cxx; sourceTree = ""; };
@@ -118,14 +117,6 @@
BE35B56A1886C50A001B7439 /* metric.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metric.cxx;
path = ../../../vcl/source/gdi/metric.cxx; sourceTree = ""; };
BE35B56B1886C50A001B7439 /* octree.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = octree.cxx;
path = ../../../vcl/source/gdi/octree.cxx; sourceTree = ""; };
BE35B56C1886C50A001B7439 /* oldprintadaptor.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
oldprintadaptor.cxx; path = ../../../vcl/source/gdi/oldprintadaptor.cxx;
sourceTree = ""; };
- BE35B56D1886C50A001B7439 /* outdev.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev.cxx;
path = ../../../vcl/source/gdi/outdev.cxx; sourceTree = ""; };
- BE35B56E1886C50A001B7439 /* outdev2.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev2.cxx;
path = ../../../vcl/source/gdi/outdev2.cxx; sourceTree = ""; };
- BE35B56F1886C50A001B7439 /* outdev3.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev3.cxx;
path = ../../../vcl/source/gdi/outdev3.cxx; sourceTree = ""; };
- BE35B5701886C50A001B7439 /* outdev4.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev4.cxx;
path = ../../../vcl/source/gdi/outdev4.cxx; sourceTree = ""; };
- BE35B5711886C50A001B7439 /* outdev5.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev5.cxx;
path = ../../../vcl/source/gdi/outdev5.cxx; sourceTree = ""; };
- BE35B5721886C50A001B7439 /* outdev6.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev6.cxx;
path = ../../../vcl/source/gdi/outdev6.cxx; sourceTree = ""; };
- BE35B5731886C50A001B7439 /* outdevnative.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
outdevnative.cxx; path = ../../../vcl/source/gdi/outdevnative.cxx; sourceTree =
""; };
- BE35B5741886C50A001B7439 /* outmap.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outmap.cxx;
path = ../../../vcl/source/gdi/outmap.cxx; sourceTree = ""; };
BE35B5751886C50A001B7439 /* pdfextoutdevdata.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
pdfextoutdevdata.cxx; path = ../../../vcl/source/gdi/pdfextoutdevdata.cxx;
sourceTree = ""; };
BE35B5761886C50A001B7439 /* pdffontcache.cxx */ = {isa =
PBXFileReference; lastKnownF
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 92/55b5e185684b00be4cd72e537120647e838a40
92/55b5e185684b00be4cd72e537120647e838a40 |1 + 1 file changed, 1 insertion(+) New commits: commit 409c0fbf2122cad192b9e2a76166f7ee3d131932 Author: Caolán McNamara Date: Fri May 23 15:26:09 2014 +0100 Notes added by 'git notes add' diff --git a/92/55b5e185684b00be4cd72e537120647e838a40 b/92/55b5e185684b00be4cd72e537120647e838a40 new file mode 100644 index 000..c504c71 --- /dev/null +++ b/92/55b5e185684b00be4cd72e537120647e838a40 @@ -0,0 +1 @@ +prefer: 72703332ff42a70d19050d78a63286b9a9b6f930 ___ 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/window/mouse.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ba6f1faba646e0b400aca52728f723449926db0
Author: Tor Lillqvist
Date: Fri May 23 17:19:13 2014 +0300
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: I57eaa91b4c9f7fe5e3afc6f170f19492352fb633
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 2005fcc..b829bbf 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -78,7 +78,7 @@ bool Window::ImplTestMousePointerSet()
{
// as soon as mouse is captured, switch mouse-pointer
if ( IsMouseCaptured() )
-return sal_True;
+return true;
// if the mouse is over the window, switch it
Rectangle aClientRect( Point( 0, 0 ), GetOutputSizePixel() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Additional predefined label formats #fdo79068
Hi Winfried, Winfried Donkers schrieb: Hi Regina, Having added/changed a lot of the labels already, I'm willing to add these too (if that's what you mean). Or do you intend to add them yourself? If I understand it correctly, the manufacturer is going to provide a patch by himself. He only needs a kind of OK to start working. Kind regards Regina Winfried -Oorspronkelijk bericht- Van: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Namens Regina Henschel Verzonden: donderdag 22 mei 2014 23:59 Aan: LO-dev Onderwerp: Additional predefined label formats #fdo79068 Hi, in https://bugs.freedesktop.org/show_bug.cgi?id=79068 a manufacture ask to get his labels integrated in LibreOffice. Would that be OK? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/cppumaker/cpputype.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 7d4924a4028963697952af17a27c32c1ec4e13ef
Author: Noel Grandin
Date: Fri May 23 16:33:08 2014 +0200
improve parameter flow in cpputype.cxx
after commit
c5d47c327a57df55
"add default value for Context param in uno::Exception constructors"
Change-Id: Ib429b58c559ecd48764a8df2f49d5470057c2c63
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 29f4b15..1ef6506 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2682,7 +2682,7 @@ private:
bool dumpBaseMembers(
FileStream & out, OUString const & base, bool withType,
-bool withDefaults, bool parentsHadDirectMember);
+bool eligibleForDefaults);
sal_uInt32 getTotalMemberCount(OUString const & base) const;
@@ -2732,7 +2732,7 @@ void ExceptionType::dumpHxxFile(
out << "}\n\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0)
{
out << indent() << "inline " << id_ << "::" << id_ << "(";
-first = !dumpBaseMembers(out, base, true, false, false);
+first = !dumpBaseMembers(out, base, true, false);
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator
i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
@@ -2750,7 +2750,7 @@ void ExceptionType::dumpHxxFile(
if (!base.isEmpty()) {
out << indent() << ": " << codemaker::cpp::scopedCppName(u2b(base))
<< "(";
-dumpBaseMembers(out, base, false, false, false);
+dumpBaseMembers(out, base, false, false);
out << ")\n";
first = false;
}
@@ -2986,9 +2986,8 @@ void ExceptionType::dumpDeclaration(FileStream & out) {
<< "() SAL_THROW(());\n\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0)
{
out << indent() << "inline CPPU_GCC_DLLPRIVATE " << id_ << "(";
-bool withDefaults = true;
-bool parentsHadDirectMembers = !entity_->getDirectMembers().empty();
-bool first = !dumpBaseMembers(out, base, true, withDefaults,
parentsHadDirectMembers);
+bool eligibleForDefaults = entity_->getDirectMembers().empty();
+bool first = !dumpBaseMembers(out, base, true, eligibleForDefaults);
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator
i(entity_->getDirectMembers().begin());
i != entity_->getDirectMembers().end(); ++i)
@@ -3027,7 +3026,7 @@ void ExceptionType::dumpDeclaration(FileStream & out) {
}
bool ExceptionType::dumpBaseMembers(
-FileStream & out, OUString const & base, bool withType, bool withDefaults,
bool parentsHadDirectMember)
+FileStream & out, OUString const & base, bool withType, bool
eligibleForDefaults)
{
bool hasMember = false;
if (!base.isEmpty()) {
@@ -3041,7 +3040,7 @@ bool ExceptionType::dumpBaseMembers(
dynamic_cast< unoidl::ExceptionTypeEntity * >(ent.get()));
assert(ent2.is());
hasMember = dumpBaseMembers( out, ent2->getDirectBase(), withType,
-withDefaults, parentsHadDirectMember ||
!ent2->getDirectMembers().empty() );
+eligibleForDefaults &&
ent2->getDirectMembers().empty() );
int memberCount = 0;
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator
i(ent2->getDirectMembers().begin());
@@ -3058,8 +3057,7 @@ bool ExceptionType::dumpBaseMembers(
// We want to provide a default parameter value for uno::Exception
subtype
// constructors, since most of the time we don't pass a Context
object in to the exception
// throw sites.
-if (withDefaults
- && !parentsHadDirectMember
+if (eligibleForDefaults
&& base == "com.sun.star.uno.Exception"
&& memberCount == 1
&& i->name == "Context"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autotext/lang/bg/standard.bau|binary extras/source/autotext/lang/cs/standard.bau|binary extras/source/autotext/lang/da/standard.bau|binary extras/source/autotext/lang/de/standard.bau|binary extras/source/autotext/lang/en-GB/standard.bau |binary extras/source/autotext/lang/en-US/standard.bau |binary extras/source/autotext/lang/es/standard.bau|binary extras/source/autotext/lang/fr/standard.bau|binary extras/source/autotext/lang/hu/standard.bau|binary extras/source/autotext/lang/it/standard.bau|binary extras/source/autotext/lang/ja/standard.bau|binary extras/source/autotext/lang/km/standard.bau|binary extras/source/autotext/lang/ko/standard.bau|binary extras/source/autotext/lang/mn/standard.bau|binary extras/source/autotext/lang/nl/standard.bau|binary extras/source/autotext/lang/pl/standard.bau|binary extras/source/autotext/lang/pt-BR/standard.bau |binary extras/source/autotext/lang/pt/standard.bau|binary extras/source/autotext/lang/ru/standard.bau|binary extras/source/autotext/lang/sk/crdbus50.bau|binary extras/source/autotext/lang/sk/crdbus54.bau|binary extras/source/autotext/lang/sk/standard.bau|binary extras/source/autotext/lang/sk/template.bau|binary extras/source/autotext/lang/sl/standard.bau|binary extras/source/autotext/lang/sv/standard.bau|binary extras/source/autotext/lang/zh-CN/standard.bau |binary extras/source/autotext/lang/zh-TW/standard.bau |binary 27 files changed New commits: commit fed7156496115e015bffe2b89861870d076c5d78 Author: Laurent Balland-Poirier Date: Mon May 19 21:30:59 2014 +0200 fdo#78833 Improve AutoTexts for all languages (mainly FN Autotext) - AutoText FN (Formula Numbering) for all locales: - fix name of table and equation in localized name i#93627 - remove size attributes of equation preview to use default font size of Math equation - Add a real nosense dummy AutoText based on wellknown "Lorem Ipsum" (LOREM+F3) for all locales - fix some typo mistakes in French (see fdo#78833) - fix all Slovak (sk) files: - remove CVS directories - remove empty pictures directories - create manifest.xml files - add empty mimetype file at the right place in standard.bau files for all locales - rebuild manifest.xml files for all locales (with DOCTYPE) Change-Id: I0f1745138dfcec1c9cccd86b8daa89fea47e5b17 Reviewed-on: https://gerrit.libreoffice.org/9408 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/autotext/lang/bg/standard.bau b/extras/source/autotext/lang/bg/standard.bau index f3fdbfc..328e293 100644 Binary files a/extras/source/autotext/lang/bg/standard.bau and b/extras/source/autotext/lang/bg/standard.bau differ diff --git a/extras/source/autotext/lang/cs/standard.bau b/extras/source/autotext/lang/cs/standard.bau index 8b20efa..5d9542a 100644 Binary files a/extras/source/autotext/lang/cs/standard.bau and b/extras/source/autotext/lang/cs/standard.bau differ diff --git a/extras/source/autotext/lang/da/standard.bau b/extras/source/autotext/lang/da/standard.bau index 3483be6..db9b7ed 100644 Binary files a/extras/source/autotext/lang/da/standard.bau and b/extras/source/autotext/lang/da/standard.bau differ diff --git a/extras/source/autotext/lang/de/standard.bau b/extras/source/autotext/lang/de/standard.bau index 76f51ec..1c0f686 100644 Binary files a/extras/source/autotext/lang/de/standard.bau and b/extras/source/autotext/lang/de/standard.bau differ diff --git a/extras/source/autotext/lang/en-GB/standard.bau b/extras/source/autotext/lang/en-GB/standard.bau index 60fd3d9..b5d2bc3 100644 Binary files a/extras/source/autotext/lang/en-GB/standard.bau and b/extras/source/autotext/lang/en-GB/standard.bau differ diff --git a/extras/source/autotext/lang/en-US/standard.bau b/extras/source/autotext/lang/en-US/standard.bau index 40cec77..064aee2 100644 Binary files a/extras/source/autotext/lang/en-US/standard.bau and b/extras/source/autotext/lang/en-US/standard.bau differ diff --git a/extras/source/autotext/lang/es/standard.bau b/extras/source/autotext/lang/es/standard.bau index 9158ead..98a058c 100644 Binary files a/extras/source/autotext/lang/es/standard.bau and b/extras/source/autotext/lang/es/standard.bau differ diff --git a/extras/source/autotext/lang/fr/standard.bau b/extras/source/autotext/lang/fr/standard.bau index 4c7f8b8..bb76018 100644 Binary files a/extras/source/autotext/lang/fr/standard.bau and b/extras/source/autotext/lang/fr/standard.bau differ diff --git a/extras/source/autotext/lang/hu/standard.bau b/extras/source/autotext/lang/hu/standard.bau index bb064ab..abadb47 100644 Binary files a/extras/source/autotext/lang/hu/standard.bau and b/extras/source/autotext/lang/hu/standard.bau differ diff --git a/extras/source/autotext/lang/it/standard.bau b/extras/source/autotext/lang/it/standard.bau index ca
[Libreoffice-commits] core.git: extras/source
extras/source/autotext/lang/af-ZA/standard.bau |binary extras/source/autotext/lang/ca/standard.bau |binary extras/source/autotext/lang/en-AU/standard.bau |binary extras/source/autotext/lang/en-ZA/standard.bau |binary extras/source/autotext/lang/fa/standard.bau |binary extras/source/autotext/lang/fi/standard.bau |binary extras/source/autotext/lang/ga-IE/standard.bau |binary extras/source/autotext/lang/hr/standard.bau |binary extras/source/autotext/lang/is/standard.bau |binary extras/source/autotext/lang/lb-LU/standard.bau |binary extras/source/autotext/lang/lt/standard.bau |binary extras/source/autotext/lang/nl-BE/standard.bau |binary extras/source/autotext/lang/ro/standard.bau |binary extras/source/autotext/lang/sr-CS/standard.bau |binary extras/source/autotext/lang/sr-Latn-CS/standard.bau |binary extras/source/autotext/lang/sr-Latn-ME/standard.bau |binary extras/source/autotext/lang/sr-Latn-RS/standard.bau |binary extras/source/autotext/lang/sr-ME/standard.bau |binary extras/source/autotext/lang/sr-RS/standard.bau |binary extras/source/autotext/lang/tr/standard.bau |binary extras/source/autotext/lang/vi/standard.bau |binary 21 files changed New commits: commit f2dcc78a379c9bd5aaf93b2ed00649b28be7a6e1 Author: Laurent Balland-Poirier Date: Fri May 23 09:35:29 2014 +0200 fdo#78833 Add Fomula Numbering and Lorem Ipsum autotext to some locales Change-Id: I6236427c31e33cc50a89d6d836fd637ed9b48f05 Reviewed-on: https://gerrit.libreoffice.org/9446 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/autotext/lang/af-ZA/standard.bau b/extras/source/autotext/lang/af-ZA/standard.bau new file mode 100644 index 000..88a3266 Binary files /dev/null and b/extras/source/autotext/lang/af-ZA/standard.bau differ diff --git a/extras/source/autotext/lang/ca/standard.bau b/extras/source/autotext/lang/ca/standard.bau new file mode 100644 index 000..8c5258d Binary files /dev/null and b/extras/source/autotext/lang/ca/standard.bau differ diff --git a/extras/source/autotext/lang/en-AU/standard.bau b/extras/source/autotext/lang/en-AU/standard.bau new file mode 100644 index 000..963e7ef Binary files /dev/null and b/extras/source/autotext/lang/en-AU/standard.bau differ diff --git a/extras/source/autotext/lang/en-ZA/standard.bau b/extras/source/autotext/lang/en-ZA/standard.bau new file mode 100644 index 000..963e7ef Binary files /dev/null and b/extras/source/autotext/lang/en-ZA/standard.bau differ diff --git a/extras/source/autotext/lang/fa/standard.bau b/extras/source/autotext/lang/fa/standard.bau new file mode 100644 index 000..ae8f9f4 Binary files /dev/null and b/extras/source/autotext/lang/fa/standard.bau differ diff --git a/extras/source/autotext/lang/fi/standard.bau b/extras/source/autotext/lang/fi/standard.bau new file mode 100644 index 000..b408c2b Binary files /dev/null and b/extras/source/autotext/lang/fi/standard.bau differ diff --git a/extras/source/autotext/lang/ga-IE/standard.bau b/extras/source/autotext/lang/ga-IE/standard.bau new file mode 100644 index 000..4a8cfa0 Binary files /dev/null and b/extras/source/autotext/lang/ga-IE/standard.bau differ diff --git a/extras/source/autotext/lang/hr/standard.bau b/extras/source/autotext/lang/hr/standard.bau new file mode 100644 index 000..75e07fd Binary files /dev/null and b/extras/source/autotext/lang/hr/standard.bau differ diff --git a/extras/source/autotext/lang/is/standard.bau b/extras/source/autotext/lang/is/standard.bau new file mode 100644 index 000..465c6ec Binary files /dev/null and b/extras/source/autotext/lang/is/standard.bau differ diff --git a/extras/source/autotext/lang/lb-LU/standard.bau b/extras/source/autotext/lang/lb-LU/standard.bau new file mode 100644 index 000..0aa1ae2 Binary files /dev/null and b/extras/source/autotext/lang/lb-LU/standard.bau differ diff --git a/extras/source/autotext/lang/lt/standard.bau b/extras/source/autotext/lang/lt/standard.bau new file mode 100644 index 000..c68dbf5 Binary files /dev/null and b/extras/source/autotext/lang/lt/standard.bau differ diff --git a/extras/source/autotext/lang/nl-BE/standard.bau b/extras/source/autotext/lang/nl-BE/standard.bau new file mode 100644 index 000..c122dfb Binary files /dev/null and b/extras/source/autotext/lang/nl-BE/standard.bau differ diff --git a/extras/source/autotext/lang/ro/standard.bau b/extras/source/autotext/lang/ro/standard.bau new file mode 100644 index 000..e96ecc7 Binary files /dev/null and b/extras/source/autotext/lang/ro/standard.bau differ diff --git a/extras/source/autotext/lang/sr-CS/standard.bau b/extras/source/autotext/lang/sr-CS/standard.bau new file mode 100644 index 000..0634127 Binary files /dev/null and b/extras/source/autotext/lang/sr-CS/standard.bau differ diff --git a/extras/source/autotext/lang/sr
[Libreoffice-commits] core.git: 3 commits - bridges/source external/cppunit external/python3
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |9 +++--
external/cppunit/unix.patch | 10 +-
external/python3/UnpackedTarball_python3.mk |1 +
external/python3/python-lsan.patch.0 | 19 +++
4 files changed, 36 insertions(+), 3 deletions(-)
New commits:
commit fa2fcc2074ac102d8592fdf2b429ef369dd501f3
Author: Stephan Bergmann
Date: Fri May 23 16:49:45 2014 +0200
external/python3: Fix memory leak in configure check code
...that LeakSanitizer would complain about, causing the check to
erroneously fail.
Change-Id: Ieaef38576afd6196d38f395d48fd1bc92b22ddb6
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index d6a1d04..49a56e0 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.3-py17797.patch.1 \
external/python3/python-3.3.3-msvc2012-winxp.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
+ external/python3/python-lsan.patch.0 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-lsan.patch.0
b/external/python3/python-lsan.patch.0
new file mode 100644
index 000..3796904
--- /dev/null
+++ b/external/python3/python-lsan.patch.0
@@ -0,0 +1,19 @@
+--- configure
configure
+@@ -11821,6 +11821,7 @@
+ break;
+ }
+ }
++freeaddrinfo(aitop);
+ }
+
+ if (!(inet4 == 0 || inet4 == 2))
+@@ -11828,8 +11829,6 @@
+ if (!(inet6 == 0 || inet6 == 2))
+ goto bad;
+
+- if (aitop)
+-freeaddrinfo(aitop);
+ return 0;
+
+ bad:
commit 67825fe270d52b78c81cc1c1c37486c11bad394e
Author: Stephan Bergmann
Date: Fri May 23 16:47:16 2014 +0200
dlclose confuses LeakSanitizer
Change-Id: I2bebbf1615ddc3619bcc3bf940f70c0967ce8534
diff --git a/external/cppunit/unix.patch b/external/cppunit/unix.patch
index 0a153ad..74de602 100644
--- a/external/cppunit/unix.patch
+++ b/external/cppunit/unix.patch
@@ -1,6 +1,14 @@
--- misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
+++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-@@ -34,7 +34,11 @@
+@@ -20,7 +20,6 @@
+ void
+ DynamicLibraryManager::doReleaseLibrary()
+ {
+- ::dlclose( m_libraryHandle);
+ }
+
+
+@@ -34,7 +33,11 @@
std::string
DynamicLibraryManager::getLastErrorDetail() const
{
commit 26cf118247855bb5caeac3d8e68906fbcfcdc837
Author: Stephan Bergmann
Date: Fri May 23 16:46:30 2014 +0200
Fix undefined misaligned writes
Change-Id: I8ad64babd43c2a692c305f3fa56331edb6d502ee
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 2373769..58c4ac1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -411,11 +411,16 @@ unsigned char * codeSnippet( unsigned char * code,
// movq $, %r10
*reinterpret_cast( code ) = 0xba49;
-*reinterpret_cast( code + 2 ) = nOffsetAndIndex;
+*reinterpret_cast( code + 2 ) = nOffsetAndIndex & 0x;
+*reinterpret_cast( code + 4 ) = nOffsetAndIndex >> 16;
+*reinterpret_cast( code + 8 ) = nOffsetAndIndex >> 48;
// movq $, %r11
*reinterpret_cast( code + 10 ) = 0xbb49;
-*reinterpret_cast( code + 12 ) =
reinterpret_cast( privateSnippetExecutor );
+*reinterpret_cast( code + 12 )
+= reinterpret_cast(privateSnippetExecutor);
+*reinterpret_cast( code + 16 )
+= reinterpret_cast(privateSnippetExecutor) >> 32;
// jmpq *%r11
*reinterpret_cast( code + 20 ) = 0x00e3ff49;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.1.0'
Tag 'libcdr-0.1.0' created by David Tardon at 2014-05-23 16:05 -0700 release libcdr 0.1.0 Changes since libcdr-0.0.14-66: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: NEWS
NEWS |3 +++ 1 file changed, 3 insertions(+) New commits: commit 56003faa885246a43d2117856f54bb89326b1668 Author: David Tardon Date: Fri May 23 17:04:10 2014 +0200 prepare for a new release Change-Id: I69e95091590452d154dafadfc6f8a22ce7770eba diff --git a/NEWS b/NEWS index e69de29..6392822 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,3 @@ +libcdr 0.1.0 + +* switch to librevenge ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 28207c36c3b68af1d09f68e1ae022b21cda976c5
Author: Jacobo Aragunde Pérez
Date: Fri May 23 16:51:28 2014 +0200
sw: Properly embed .xls sheets in .docx documents
Word requires exactly the right relationship and content types to open
embedded documents properly. The case of xls sheets is different from
xlsx so we added it to the exporter.
We know if the file is a xls or xlsx using the ProgID field:
ProgID="Excel.Sheet.8" -> Excel version 8 -> xls
ProgID="Excel.Sheet.12" -> Excel version 12 -> xlsx
Change-Id: I80bae0eadd4af2fb9793c8f6581b3f288fb42c09
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8a2ac9d..8e3a435 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4197,12 +4197,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
aObjectsInteropList[i].Value >>= sProgID;
break;
}
-if( sProgID.startsWith("Excel.Sheet") )
+if( sProgID == "Excel.Sheet.12" )
{
sMediaType =
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
sFileExtension = "xlsx";
}
+else if( sProgID.startsWith("Excel.Sheet") )
+{
+sMediaType = "application/vnd.ms-excel";
+sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";;
+sFileExtension = "xls";
+}
else if( sProgID.startsWith("PowerPoint.Show") )
{
sMediaType =
"application/vnd.openxmlformats-officedocument.presentationml.presentation";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/ooxml/model.xml |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit fafe3063bf4aac2e373e3178c12f5969da092203
Author: Miklos Vajna
Date: Fri May 23 17:07:05 2014 +0200
DOCX import: tokenize
By changing the resource to Properties, the defined attribute tokens
actually show up, and the \t characters still arrive.
Change-Id: I37b32c4fc049b74d3bebada455b2acf47b66fc5f
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 0050b89..da9bfcf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -927,6 +927,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_DataBinding_storeItemID:
m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_DataBinding_storeItemID", sStringValue);
break;
+case NS_ooxml::LN_CT_PTab_leader:
+case NS_ooxml::LN_CT_PTab_relativeTo:
+case NS_ooxml::LN_CT_PTab_alignment:
+break;
default:
{
#if OSL_DEBUG_LEVEL > 0
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 36a37f6..ae7132a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24756,7 +24756,7 @@
underscore
middleDot
-
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctlayout.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d58318952f05a1985d3f140d55326659eadd67e4
Author: Norbert Thiebaud
Date: Wed May 21 23:40:50 2014 -0500
fdo#77993 actually impact 10.6 too apparently
Change-Id: I4b3724159be64609f1e88b63ccd9275d164fcb3e
Reviewed-on: https://gerrit.libreoffice.org/9426
Tested-by: Norbert Thiebaud
Reviewed-by: Norbert Thiebaud
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 0b29673..0c317c4 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -172,7 +172,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// - CoreText handles spaces specially (in particular at the text end)
if( mnTrailingSpaceCount )
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
// don't recreate line layout here, because this can lead to problems
// (looks like internal issues inside early CoreText versions)
mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
@@ -218,7 +218,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0,
nPixelWidth - mfTrailingSpaceWidth );
#else
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0,
nPixelWidth);
@@ -235,7 +235,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
CFRelease( mpCTLine );
mpCTLine = pNewCTLine;
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
mfCachedWidth = nPixelWidth;
#else
mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
___
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' - vcl/quartz
vcl/quartz/ctlayout.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 606d51a5496f4aaeb6d955d07204db0d775def61
Author: Norbert Thiebaud
Date: Wed May 21 23:40:50 2014 -0500
fdo#77993 actually impact 10.6 too apparently
Change-Id: I4b3724159be64609f1e88b63ccd9275d164fcb3e
Reviewed-on: https://gerrit.libreoffice.org/9427
Tested-by: Norbert Thiebaud
Reviewed-by: Norbert Thiebaud
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 0b29673..0c317c4 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -172,7 +172,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// - CoreText handles spaces specially (in particular at the text end)
if( mnTrailingSpaceCount )
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
// don't recreate line layout here, because this can lead to problems
// (looks like internal issues inside early CoreText versions)
mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
@@ -218,7 +218,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0,
nPixelWidth - mfTrailingSpaceWidth );
#else
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0,
nPixelWidth);
@@ -235,7 +235,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
CFRelease( mpCTLine );
mpCTLine = pNewCTLine;
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
mfCachedWidth = nPixelWidth;
#else
mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/sdi sc/source
sc/inc/sc.hrc |1
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 23 +++
sc/source/ui/app/scdll.cxx |2
sc/source/ui/dialogs/searchresults.cxx | 68 +++--
sc/source/ui/inc/searchresults.hxx | 34 ++--
sc/source/ui/view/cellsh1.cxx | 15 +++
sc/source/ui/view/tabvwsh.cxx |5 +-
sc/source/ui/view/viewfun2.cxx | 14 +-
9 files changed, 144 insertions(+), 19 deletions(-)
New commits:
commit 81c492ef18b04cc283561018d69818cbca7f83ef
Author: Kohei Yoshida
Date: Fri May 23 11:24:24 2014 -0400
fdo#79011: Properly implement the search results dialog as modeless.
It's unfortunate that adding a modeless dialog is such a pain. But we
still need to implemenet this properly else we'll leak at best, or end
up with tons of weird bugs at worst.
Change-Id: Ie03260f288fad76f994d0ca6a8b1feeade299ffd
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 2253aac..5204efb 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -270,6 +270,7 @@
#define SID_MOVING_AVERAGE_DIALOG (SC_MESSAGE_START + 77)
#define SID_TTEST_DIALOG(SC_MESSAGE_START + 78)
#define SID_FTEST_DIALOG(SC_MESSAGE_START + 79)
+#define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 80)
// functions
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 62ce485..8447768 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -161,6 +161,7 @@ interface CellSelection
SID_MOVING_AVERAGE_DIALOG [ ExecMethod = ExecuteEdit;
StateMethod = GetBlockState; ]
SID_TTEST_DIALOG[ ExecMethod = ExecuteEdit;
StateMethod = GetBlockState; ]
SID_FTEST_DIALOG[ ExecMethod = ExecuteEdit;
StateMethod = GetBlockState; ]
+SID_SEARCH_RESULTS_DIALOG [ ExecMethod = ExecuteEdit; StateMethod =
GetBlockState; ]
SID_MARKDATAAREA[ ExecMethod = ExecuteMove; StateMethod =
GetStateCursor; ]
SID_MARKARRAYFORMULA [ ExecMethod = ExecuteMove; StateMethod =
GetStateCursor; ]
SID_SETINPUTMODE[ ExecMethod = ExecuteMove; StateMethod =
GetStateCursor; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index fe3d780..1835459 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3231,6 +3231,29 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
GroupId = GID_OPTIONS;
]
+SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_OPTIONS;
+]
SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
()
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index d4cf759..9f9f839 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -72,6 +72,7 @@
#include "docpool.hxx"
#include "appoptio.hxx"
+#include
// Controls
@@ -285,6 +286,7 @@ void ScDLL::Init()
ScSpellDialogChildWindow::RegisterChildWindow(false, pMod);
ScValidityRefChildWin::RegisterChildWindow(false, pMod);
+sc::SearchResultsDlgWrapper::RegisterChildWindow(false, pMod);
// EditEngine Field; insofar not already defined in OfficeApplication::Init
SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
diff --git a/sc/source/ui/dialogs/searchresults.cxx
b/sc/source/ui/dialogs/searchresults.cxx
index 3b27a2a..51c5ece 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -11,14 +11,19 @@
#include
#include
+#include
+#include
#include "dociter.hxx"
#include "document.hxx"
#include "rangeutl.hxx"
#include "tabvwsh.hxx"
+#include
-SearchResults::SearchResults(ScDocument *pDoc) :
-ModelessDialog(NULL, "SearchResultsDialog",
"modules/scalc/ui/searchresults.ui")
-, mpDoc(pDoc)
+namespace sc {
+
+SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, Window* pParent,
sal_uInt16 nId ) :
+ModelessDialog(pParent, "SearchResultsDialog",
"modules/scalc/ui/searchresults.ui"),
+mpBindings(_pBindings), mnId(nId), mpDoc(NULL)
{
SvSimpleTableContainer *pContainer =
get("results");
Size aControlSize(150, 120);
@@ -30,36 +35,56 @@ SearchResults::SearchResults(ScDocument *pDoc) :
long nTabs[] = {3, 0, 40, 60};
mpList->SetTabs(&nTabs[0]);
mpList->InsertHeaderEntry("Sheet\tCell\tContent");
-mpList->SetSelectHdl( LINK(this, SearchResults, ListSelectHdl) );
+mpList->SetSelectHdl( LINK(this, SearchResultsDlg, ListSelectHdl) );
}
-SearchResults::~SearchResults()
+SearchRes
[Bug 79123] Autoabandon gerrit changes with negative feedback and more than 1 month without action
https://bugs.freedesktop.org/show_bug.cgi?id=79123 --- Comment #1 from Norbert Thiebaud --- exception: if a patch has been marked with negative feedback by the author of the patch himself, leave it alone marking one's patch with -2 is used to indicate a 'working' patch.. something uploaded for review/discussion purpose but not intended to be merge as is There is no reason to make these disappear -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/inc sc/sdi sc/source
sc/inc/sc.hrc |1
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 23 +++
sc/source/ui/app/scdll.cxx |2
sc/source/ui/dialogs/searchresults.cxx | 68 +++--
sc/source/ui/inc/searchresults.hxx | 34 ++--
sc/source/ui/view/cellsh1.cxx | 15 +++
sc/source/ui/view/tabvwsh.cxx |5 +-
sc/source/ui/view/viewfun2.cxx | 14 +-
9 files changed, 144 insertions(+), 19 deletions(-)
New commits:
commit 0f867f052d2672fdb91ee3be9e056ae97a8e642c
Author: Kohei Yoshida
Date: Fri May 23 11:24:24 2014 -0400
fdo#79011: Properly implement the search results dialog as modeless.
It's unfortunate that adding a modeless dialog is such a pain. But we
still need to implemenet this properly else we'll leak at best, or end
up with tons of weird bugs at worst.
Change-Id: Ie03260f288fad76f994d0ca6a8b1feeade299ffd
(cherry picked from commit 81c492ef18b04cc283561018d69818cbca7f83ef)
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 2253aac..5204efb 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -270,6 +270,7 @@
#define SID_MOVING_AVERAGE_DIALOG (SC_MESSAGE_START + 77)
#define SID_TTEST_DIALOG(SC_MESSAGE_START + 78)
#define SID_FTEST_DIALOG(SC_MESSAGE_START + 79)
+#define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 80)
// functions
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 62ce485..8447768 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -161,6 +161,7 @@ interface CellSelection
SID_MOVING_AVERAGE_DIALOG [ ExecMethod = ExecuteEdit;
StateMethod = GetBlockState; ]
SID_TTEST_DIALOG[ ExecMethod = ExecuteEdit;
StateMethod = GetBlockState; ]
SID_FTEST_DIALOG[ ExecMethod = ExecuteEdit;
StateMethod = GetBlockState; ]
+SID_SEARCH_RESULTS_DIALOG [ ExecMethod = ExecuteEdit; StateMethod =
GetBlockState; ]
SID_MARKDATAAREA[ ExecMethod = ExecuteMove; StateMethod =
GetStateCursor; ]
SID_MARKARRAYFORMULA [ ExecMethod = ExecuteMove; StateMethod =
GetStateCursor; ]
SID_SETINPUTMODE[ ExecMethod = ExecuteMove; StateMethod =
GetStateCursor; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index fe3d780..1835459 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3231,6 +3231,29 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
GroupId = GID_OPTIONS;
]
+SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_OPTIONS;
+]
SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
()
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index d4cf759..9f9f839 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -72,6 +72,7 @@
#include "docpool.hxx"
#include "appoptio.hxx"
+#include
// Controls
@@ -285,6 +286,7 @@ void ScDLL::Init()
ScSpellDialogChildWindow::RegisterChildWindow(false, pMod);
ScValidityRefChildWin::RegisterChildWindow(false, pMod);
+sc::SearchResultsDlgWrapper::RegisterChildWindow(false, pMod);
// EditEngine Field; insofar not already defined in OfficeApplication::Init
SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
diff --git a/sc/source/ui/dialogs/searchresults.cxx
b/sc/source/ui/dialogs/searchresults.cxx
index 3b27a2a..51c5ece 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -11,14 +11,19 @@
#include
#include
+#include
+#include
#include "dociter.hxx"
#include "document.hxx"
#include "rangeutl.hxx"
#include "tabvwsh.hxx"
+#include
-SearchResults::SearchResults(ScDocument *pDoc) :
-ModelessDialog(NULL, "SearchResultsDialog",
"modules/scalc/ui/searchresults.ui")
-, mpDoc(pDoc)
+namespace sc {
+
+SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, Window* pParent,
sal_uInt16 nId ) :
+ModelessDialog(pParent, "SearchResultsDialog",
"modules/scalc/ui/searchresults.ui"),
+mpBindings(_pBindings), mnId(nId), mpDoc(NULL)
{
SvSimpleTableContainer *pContainer =
get("results");
Size aControlSize(150, 120);
@@ -30,36 +35,56 @@ SearchResults::SearchResults(ScDocument *pDoc) :
long nTabs[] = {3, 0, 40, 60};
mpList->SetTabs(&nTabs[0]);
mpList->InsertHeaderEntry("Sheet\tCell\tContent");
-mpList->SetSelectHdl( LINK(this, SearchResults, ListSelectHdl) );
+mpList->SetSelectHdl( LINK(this, SearchResul
[Bug 79123] Autoabandon gerrit changes with negative feedback and more than 1 month without action
https://bugs.freedesktop.org/show_bug.cgi?id=79123 --- Comment #2 from Norbert Thiebaud --- Another things: that auto purge stuff _have to_ be project configurable... gerrit is used to track MC activity for instance, and patch there must not be messed with in any way. -- 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: sfx2/source
sfx2/source/doc/objmisc.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 5befa0c5c28bce987eb862e7c5bb11abdf8fe81d
Author: Tor Lillqvist
Date: Fri May 23 18:30:09 2014 +0300
Correct #endif placement (avoid linking error for TiledLibreOffice)
Change-Id: I37577456740b4dd255df22047ce7740bd1e43ace
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0e825c4..2b0a58e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -669,7 +669,7 @@ bool SfxObjectShell::HasSharedXMLFlagSet() const
return pImp->m_bSharedXMLFlag;
}
-
+#endif
bool SfxObjectShell::IsDocShared() const
{
@@ -691,10 +691,6 @@ OUString SfxObjectShell::GetSharedFileURL() const
#endif
}
-#endif
-
-
-
Size SfxObjectShell::GetFirstPageSize()
{
return GetVisArea(ASPECT_THUMBNAIL).GetSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 2 commits - chart2/source sc/source
chart2/source/view/main/GL3DRenderer.cxx |2 +- sc/source/ui/view/tabvwsh4.cxx |5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 49bad83f25f6bc186721849edb0c78990a33e100 Author: Markus Mohrhard Date: Fri May 23 17:33:39 2014 +0200 we need to map 100th mm to pixel also for the import Change-Id: I09084d67283b10e024ed926dc0e8d38030d28713 diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 01c171d..7a3a35f 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -545,10 +545,11 @@ void ScTabViewShell::AddOpenGLChartWindows() OpenGLWindow* pOpenGLWindow = new OpenGLWindow(pParentWindow); pOpenGLWindow->Show(false); Size aSize = itr->second.GetSize(); +Size aWindowSize = pOpenGLWindow->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) ); -pOpenGLWindow->SetSizePixel(aSize); +pOpenGLWindow->SetSizePixel(aWindowSize); Point aPos = itr->second.TopLeft(); -pOpenGLWindow->SetPosPixel(aPos); +pOpenGLWindow->SetPosPixel(pOpenGLWindow->LogicToPixel(aPos, MapMode(MAP_100TH_MM))); pParentWindow->AddChildWindow(pOpenGLWindow); uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider( itr->first, uno::UNO_QUERY_THROW ); sal_uInt64 nWindowPtr = reinterpret_cast(pOpenGLWindow); commit 973f75538aef108fadaa339adef94220dab1dbe1 Author: Markus Mohrhard Date: Fri May 23 17:32:54 2014 +0200 we don't want the debug rendering enabled Change-Id: Id7b9152b946dbef3349b825a8f094bd9d07445f2 diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index e5e08d3..19b8c6f 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -20,7 +20,7 @@ #include #include "glm/gtc/matrix_inverse.hpp" -#define DEBUG_FBO 1 +#define DEBUG_FBO 0 #define GL_PI 3.14159f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source sc/source
chart2/source/view/main/GL3DRenderer.cxx |2 +- sc/source/ui/view/tabvwsh4.cxx |5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit c2ce981dfb40c36797620e8d026f616571b98082 Author: Markus Mohrhard Date: Fri May 23 17:36:40 2014 +0200 don't enable debug renderingto png Change-Id: Ib15c3fb2f2dd61a9bbab9b6c47866e15c8a7659a diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 6b96b5f..b2db1e7 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -21,7 +21,7 @@ #include "glm/gtc/matrix_inverse.hpp" #include -#define DEBUG_FBO 1 +#define DEBUG_FBO 0 #define GL_PI 3.14159f commit 77b320118b4ce837d038d6cb8eabb1d959010ae8 Author: Markus Mohrhard Date: Fri May 23 17:33:39 2014 +0200 we need to map 100th mm to pixel also for the import Change-Id: I09084d67283b10e024ed926dc0e8d38030d28713 diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 01c171d..7a3a35f 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -545,10 +545,11 @@ void ScTabViewShell::AddOpenGLChartWindows() OpenGLWindow* pOpenGLWindow = new OpenGLWindow(pParentWindow); pOpenGLWindow->Show(false); Size aSize = itr->second.GetSize(); +Size aWindowSize = pOpenGLWindow->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) ); -pOpenGLWindow->SetSizePixel(aSize); +pOpenGLWindow->SetSizePixel(aWindowSize); Point aPos = itr->second.TopLeft(); -pOpenGLWindow->SetPosPixel(aPos); +pOpenGLWindow->SetPosPixel(pOpenGLWindow->LogicToPixel(aPos, MapMode(MAP_100TH_MM))); pParentWindow->AddChildWindow(pOpenGLWindow); uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider( itr->first, uno::UNO_QUERY_THROW ); sal_uInt64 nWindowPtr = reinterpret_cast(pOpenGLWindow); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/langbox.cxx | 19 +++
1 file changed, 19 insertions(+)
New commits:
commit 04ccece7299ac1e57488e5ef36af122edeec2aae
Author: Eike Rathke
Date: Fri May 23 17:17:18 2014 +0200
feedback color indicator for invalid tags
Change-Id: I235e32587779369c139aedd1961b37d8fcad8f53
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 4d9b3dd..194a0d8 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -707,6 +707,7 @@ sal_Int32 SvxLanguageComboBox::ImplGetSavedValue() const
IMPL_LINK( SvxLanguageComboBox, EditModifyHdl, SvxLanguageComboBox*, /*pEd*/ )
{
+EditedAndValid eOldState = meEditedAndValid;
OUString aStr( vcl::I18nHelper::filterFormattingChars( GetText()));
if (aStr.isEmpty())
meEditedAndValid = EDITED_INVALID;
@@ -744,6 +745,24 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl,
SvxLanguageComboBox*, /*pEd*/ )
}
}
}
+if (eOldState != meEditedAndValid)
+{
+if (meEditedAndValid == EDITED_INVALID)
+{
+#if 0
+//! Gives white on white!?! instead of white on reddish.
+SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
+SetControlForeground( ::Color( COL_WHITE));
+#else
+SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
+#endif
+}
+else
+{
+SetControlForeground();
+SetControlBackground();
+}
+}
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79123] Autoabandon gerrit changes with negative feedback and more than 1 month without action
https://bugs.freedesktop.org/show_bug.cgi?id=79123 --- Comment #3 from Björn Michaelsen --- (In reply to comment #1) > exception: if a patch has been marked with negative feedback by the author > of the patch himself, leave it alone > marking one's patch with -2 is used to indicate a 'working' patch.. No even then. The recommended way to do a working patch is using drafts: https://wiki.documentfoundation.org/Gerrit#Submitting_patches_as_drafts Everything else is frustrating reviewers checking "open" changes. Also, even _if_ a change would still be uploaded accidentally for review although it is not intended to be merged as is, there is little harm done, when the change is abandoned under the conditions above. Reviving a abandoned change is trivial and the autoabandon is actually a helpful reminder -- better than letting them stay in limbo for months. -- 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 79123] Autoabandon gerrit changes with negative feedback and more than 1 month without action
https://bugs.freedesktop.org/show_bug.cgi?id=79123 --- Comment #4 from Björn Michaelsen --- (In reply to comment #2) > Another things: that auto purge stuff _have to_ be project configurable... > gerrit is used to track MC activity for instance, and patch there must not > be messed with in any way. As an Easy Hack is limited to project:core for the start -- its the majority of changes anyway. -- 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 79116] make paste special easier to use
https://bugs.freedesktop.org/show_bug.cgi?id=79116 Kohei Yoshida changed: What|Removed |Added Severity|normal |enhancement -- 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: cui/source
cui/source/options/optgdlg.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 3d79d4ae3dff4305fa0808c34d3fb14bc0fe1e82
Author: Eike Rathke
Date: Fri May 23 17:46:41 2014 +0200
make this a little less confusing
... and change to a friendlier red for invalid patterns.
Change-Id: I19488abd496b144439d7918dc31cfd3f5f4fef92
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ffa6f7e..81cf5d5 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1762,16 +1762,12 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*,
pEd )
}
else
{
-// color to use as background for an invalid pattern
-#define INVALID_PATTERN_BACKGROUND_COLOR ::Color(0xff6563)
#if 0
-// color to use as foreground for an invalid pattern
-#define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE)
-//! Gives white on white!?!
-pEd->SetControlBackground( INVALID_PATTERN_BACKGROUND_COLOR);
-pEd->SetControlForeground( INVALID_PATTERN_FOREGROUND_COLOR);
+//! Gives white on white!?! instead of white on reddish.
+pEd->SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
+pEd->SetControlForeground( ::Color( COL_WHITE));
#else
-pEd->SetControlForeground( INVALID_PATTERN_BACKGROUND_COLOR);
+pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
#endif
}
return 0;
___
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' - 2 commits - cui/source svx/source
cui/source/options/optgdlg.cxx | 12
svx/source/dialog/langbox.cxx | 19 +++
2 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 524a83a3217bad4dcce96c2cddc9bf9c4b0f2292
Author: Eike Rathke
Date: Fri May 23 17:46:41 2014 +0200
make this a little less confusing
... and change to a friendlier red for invalid patterns.
Change-Id: I19488abd496b144439d7918dc31cfd3f5f4fef92
(cherry picked from commit 3d79d4ae3dff4305fa0808c34d3fb14bc0fe1e82)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ffa6f7e..81cf5d5 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1762,16 +1762,12 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*,
pEd )
}
else
{
-// color to use as background for an invalid pattern
-#define INVALID_PATTERN_BACKGROUND_COLOR ::Color(0xff6563)
#if 0
-// color to use as foreground for an invalid pattern
-#define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE)
-//! Gives white on white!?!
-pEd->SetControlBackground( INVALID_PATTERN_BACKGROUND_COLOR);
-pEd->SetControlForeground( INVALID_PATTERN_FOREGROUND_COLOR);
+//! Gives white on white!?! instead of white on reddish.
+pEd->SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
+pEd->SetControlForeground( ::Color( COL_WHITE));
#else
-pEd->SetControlForeground( INVALID_PATTERN_BACKGROUND_COLOR);
+pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
#endif
}
return 0;
commit fcf07f67958672088c346fe0ed5f41130c905721
Author: Eike Rathke
Date: Fri May 23 17:17:18 2014 +0200
feedback color indicator for invalid tags
Change-Id: I235e32587779369c139aedd1961b37d8fcad8f53
(cherry picked from commit 04ccece7299ac1e57488e5ef36af122edeec2aae)
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 028e33d..fc6262c 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -704,6 +704,7 @@ sal_Int32 SvxLanguageComboBox::ImplGetSavedValue() const
IMPL_LINK( SvxLanguageComboBox, EditModifyHdl, SvxLanguageComboBox*, /*pEd*/ )
{
+EditedAndValid eOldState = meEditedAndValid;
OUString aStr( vcl::I18nHelper::filterFormattingChars( GetText()));
if (aStr.isEmpty())
meEditedAndValid = EDITED_INVALID;
@@ -741,6 +742,24 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl,
SvxLanguageComboBox*, /*pEd*/ )
}
}
}
+if (eOldState != meEditedAndValid)
+{
+if (meEditedAndValid == EDITED_INVALID)
+{
+#if 0
+//! Gives white on white!?! instead of white on reddish.
+SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
+SetControlForeground( ::Color( COL_WHITE));
+#else
+SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
+#endif
+}
+else
+{
+SetControlForeground();
+SetControlBackground();
+}
+}
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - svx/source sw/inc sw/source
svx/source/svdraw/svdograf.cxx|8 +---
sw/inc/ndgrf.hxx |2 +-
sw/source/core/graphic/ndgrf.cxx | 37 ++---
sw/source/filter/xml/xmltexte.cxx | 32 +---
4 files changed, 37 insertions(+), 42 deletions(-)
New commits:
commit d6af1b601bb8fe2569d17e01505f67e1becc9366
Author: Oliver-Rainer Wittmann
Date: Fri May 23 14:50:23 2014 +
124966: keep picture format information - instance - also for the
reading of preview picture data
in order to avoid trouble on save in case that the preview data equals the
picture data
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index fc08d4b..b70f12f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1537,9 +1537,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
{
pFilterData = new com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >( 3 );
-com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
-sal_Bool bAllowPartialStreamRead = sal_True;
-sal_Bool bCreateNativeLink = sal_False;
+const com::sun::star::awt::Size aPreviewSizeHint( 64,
64 );
+const sal_Bool bAllowPartialStreamRead = sal_True;
+// create instance also for previews in
order to avoid that its corresponding
+// data is cleared in the graphic cache entry in case
that the preview data equals the complete graphic data
+const sal_Bool bCreateNativeLink = sal_True;
(*pFilterData)[ 0 ].Name = String(
RTL_CONSTASCII_USTRINGPARAM( "PreviewSizeHint" ) );
(*pFilterData)[ 0 ].Value <<= aPreviewSizeHint;
(*pFilterData)[ 1 ].Name = String(
RTL_CONSTASCII_USTRINGPARAM( "AllowPartialStreamRead" ) );
commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9
Author: Oliver-Rainer Wittmann
Date: Fri May 23 14:28:40 2014 +
124946: only apply new embedded stream name for a graphic, if is already
has one.
- needed correction for the fix made for issue 114361
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 6d59466..c40eb15 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -75,7 +75,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
void InsertLink( const String& rGrfName, const String& rFltName );
sal_Bool ImportGraphic( SvStream& rStrm );
-sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
void _GetStreamStorageNames( String& rStrmName, String& rStgName ) const;
void DelStreamName();
DECL_LINK( SwapGraphic, GraphicObject* );
@@ -177,6 +176,7 @@ public:
// Entfernen der Grafik, um Speicher freizugeben
short SwapOut();
+sal_Bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
// applying new stream name for embedded graphic - needed as saving the
document might change this stream name
void ApplyNewEmbeddedStreamName( const String& r )
{
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index e9c6348..6c42713 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -239,7 +239,7 @@ sal_Bool SwGrfNode::ReRead(
else if( pGraphic && !rGrfName.Len() )
{
// MIB 27.02.2001: Old stream must be deleted before the new one is
set.
-if( HasStreamName() )
+if( HasEmbeddedStreamName() )
DelStreamName();
maGrfObj.SetGraphic( *pGraphic );
@@ -249,7 +249,7 @@ sal_Bool SwGrfNode::ReRead(
else if( pGrfObj && !rGrfName.Len() )
{
// MIB 27.02.2001: Old stream must be deleted before the new one is
set.
-if( HasStreamName() )
+if( HasEmbeddedStreamName() )
DelStreamName();
maGrfObj = *pGrfObj;
@@ -265,7 +265,7 @@ sal_Bool SwGrfNode::ReRead(
else
{
-if( HasStreamName() )
+if( HasEmbeddedStreamName() )
DelStreamName();
// einen neuen Grafik-Link anlegen
@@ -546,21 +546,16 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
else
nRet = 1;
}
-else if( maGrfObj.IsSwappedOut() )
+else if ( maGrfObj.IsSwappedOut() )
{
// Die Grafik ist im Storage oder im TempFile drin
-if( !HasStreamName() )
-nRet = (short)maGrfObj.SwapIn();
+if ( !HasEmbeddedStreamName() )
+nRet = (short) maGrfObj.SwapIn();
else
{
-// --> OD 2005-05-04 #i48434# - usage of new method
<_GetStreamForEmbedGrf(..)>
try
{
-// --> OD, MAV 2005-08-17 #i53025# - needed correction of new
-// method <_GetStreamForEmbedGrf(..)>
-//bool bGraph
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgdlg.cxx |6 +- cui/source/options/optgdlg.hxx |2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit e0480c81a956751e48f8ef36a41c3062c1bed345 Author: Eike Rathke Date: Fri May 23 18:06:52 2014 +0200 do not store invalid date acceptance patterns in configuration Change-Id: I78cd8b304db2243fd105d4b13421b6ea0347e042 diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 81cf5d5..7b6f947 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1298,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // Configured date acceptance patterns, for example Y-M-D;M-D or empty for // locale default. -if (m_pDatePatternsED->IsValueChangedFromSaved()) +if (m_bDatePatternsValid && m_pDatePatternsED->IsValueChangedFromSaved()) pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( m_pDatePatternsED->GetText()); SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); @@ -1463,6 +1463,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); aDatePatternsString = lcl_getDatePatternsConfigString( rLocaleWrapper); } +// Let's assume patterns are valid at this point. +m_bDatePatternsValid = true; m_pDatePatternsED->SetText( aDatePatternsString); bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS); m_pDatePatternsED->Enable(!bReadonly); @@ -1659,6 +1661,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) // update the date acceptance patterns OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper); +m_bDatePatternsValid = true; m_pDatePatternsED->SetText( aDatePatternsString); return 0; @@ -1770,6 +1773,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0))); #endif } +m_bDatePatternsValid = bValid; return 0; } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index e015f4c..61b2228 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -157,6 +157,8 @@ class OfaLanguagesTabPage : public SfxTabPage OUStringm_sUserLocaleValue; OUStringm_sSystemDefaultString; +boolm_bDatePatternsValid; + DECL_LINK( SupportHdl, CheckBox* ) ; DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ; DECL_LINK( DatePatternsHdl, Edit* ) ; ___ 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' - cui/source
cui/source/options/optgdlg.cxx |6 +- cui/source/options/optgdlg.hxx |2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit d11969189092d35c13cd421c57f71ca655ea3d19 Author: Eike Rathke Date: Fri May 23 18:06:52 2014 +0200 do not store invalid date acceptance patterns in configuration Change-Id: I78cd8b304db2243fd105d4b13421b6ea0347e042 (cherry picked from commit e0480c81a956751e48f8ef36a41c3062c1bed345) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 81cf5d5..7b6f947 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1298,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // Configured date acceptance patterns, for example Y-M-D;M-D or empty for // locale default. -if (m_pDatePatternsED->IsValueChangedFromSaved()) +if (m_bDatePatternsValid && m_pDatePatternsED->IsValueChangedFromSaved()) pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( m_pDatePatternsED->GetText()); SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); @@ -1463,6 +1463,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); aDatePatternsString = lcl_getDatePatternsConfigString( rLocaleWrapper); } +// Let's assume patterns are valid at this point. +m_bDatePatternsValid = true; m_pDatePatternsED->SetText( aDatePatternsString); bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS); m_pDatePatternsED->Enable(!bReadonly); @@ -1659,6 +1661,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) // update the date acceptance patterns OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper); +m_bDatePatternsValid = true; m_pDatePatternsED->SetText( aDatePatternsString); return 0; @@ -1770,6 +1773,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd ) pEd->SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0))); #endif } +m_bDatePatternsValid = bValid; return 0; } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index e015f4c..61b2228 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -157,6 +157,8 @@ class OfaLanguagesTabPage : public SfxTabPage OUStringm_sUserLocaleValue; OUStringm_sSystemDefaultString; +boolm_bDatePatternsValid; + DECL_LINK( SupportHdl, CheckBox* ) ; DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ; DECL_LINK( DatePatternsHdl, Edit* ) ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79123] Autoabandon gerrit changes with negative feedback and more than 1 month without action
https://bugs.freedesktop.org/show_bug.cgi?id=79123 --- Comment #5 from Norbert Thiebaud --- "No even then. The recommended way to do a working patch is using drafts:" I disagree with that.. quoting yourself from a wiki page does not make a 'recommended' way. Draft are a pain in the but... and when you wrote that it was not even possible to view other's draft for most people So the feature exist.. but is by no mean 'recommended'. "there is little harm done, when the change is abandoned under the conditions above. Reviving a abandoned change is trivial and the autoabandon is actually a helpful reminder -- better than letting them stay in limbo for months." Patch are presented typically from the newsest modified to the oldest modified. furthermore reviewed -2 patch are visually easy to detect so ... such patch do not actually interfere with normal reviewer works I do not see the ground to put the burden of 'little harm' to fellow committers by messing with their work just to make the main page 'look good' I'm not arguing against the clean-up of drive by patch not being worked upon.. but a patch uploaded by a committer, explicitly marked -2 by him should be left alone. -- 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] libmspub.git: NEWS
NEWS |3 +++ 1 file changed, 3 insertions(+) New commits: commit d731971eba5bac0859a7be23249842d1ff572f7a Author: David Tardon Date: Fri May 23 18:17:21 2014 +0200 prepare for a release Change-Id: I0a52eb61623ee9da6912930136071e8aacc17786 diff --git a/NEWS b/NEWS index e69de29..53874fd 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,3 @@ +libmspub 0.1.0 + +- switch to librevenge ___ 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/window/clipping.cxx | 20
1 file changed, 20 deletions(-)
New commits:
commit 943f82a50bbf003ce61e22cff27c3481573910d7
Author: Chris Sherlock
Date: Sat May 24 02:16:01 2014 +1000
vcl: remove commented out code in ImplSysObjClip()
Change-Id: I21f342ec0e065dccc08a777da6d4fba296a7f345
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index 96ad882..51ea523 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -190,7 +190,6 @@ void Window::ExpandPaintClipRegion( const Region& rRegion )
}
}
-
Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
{
@@ -458,24 +457,6 @@ bool Window::ImplSysObjClip( const Region* pOldRegion )
}
mpWindowImpl->mpSysObj->EndSetClipRegion();
-
-//longnX;
-//longnY;
-//longnWidth;
-//longnHeight;
-//sal_uLong nRectCount;
-//ImplRegionInfo aInfo;
-//sal_BoolbRegionRect;
-
-//nRectCount = aRegion.GetRectCount();
-//mpWindowImpl->mpSysObj->BeginSetClipRegion( nRectCount );
-//bRegionRect = aRegion.ImplGetFirstRect( aInfo, nX, nY,
nWidth, nHeight );
-//while ( bRegionRect )
-//{
-//mpWindowImpl->mpSysObj->UnionClipRegion( nX, nY,
nWidth, nHeight );
-//bRegionRect = aRegion.ImplGetNextRect( aInfo, nX,
nY, nWidth, nHeight );
-//}
-//mpWindowImpl->mpSysObj->EndSetClipRegion();
}
}
else
@@ -809,5 +790,4 @@ void Window::ImplCalcOverlapRegion( const Rectangle&
rSourceRect, Region& rRegio
}
}
-
/* 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] Changes to 'refs/tags/libmspub-0.1.0'
Tag 'libmspub-0.1.0' created by David Tardon at 2014-05-23 17:18 -0700 release libmspub 0.1.0 Changes since libmspub-0.0.6-31: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: NEWS
NEWS |3 +++ 1 file changed, 3 insertions(+) New commits: commit e199cfa9896fb784b56397b04f6fc1b0acd54c06 Author: David Tardon Date: Fri May 23 18:26:57 2014 +0200 prepare for a release Change-Id: I5c68e39f71c981a0859bd602d89af3c9bd226cdb diff --git a/NEWS b/NEWS index e69de29..5841ef1 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,3 @@ +libvisio 0.1.0 + +- switch to librevenge ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: Changes to 'refs/tags/libvisio-0.1.0'
Tag 'libvisio-0.1.0' created by David Tardon at 2014-05-23 17:27 -0700 release libvisio 0.1.0 Changes since libvisio-0.0.31-49: --- 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/source
sc/source/ui/dialogs/searchresults.cxx |4 ++--
sc/source/ui/inc/searchresults.hxx |2 --
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 8640859d6898943506f28be46c7778a677893ca8
Author: Tor Lillqvist
Date: Fri May 23 18:32:33 2014 +0300
WaE: private field 'mnId' is not used
Change-Id: I406ebb303b1f36f827c3cbf33f8f4cf3dcaed2f1
diff --git a/sc/source/ui/dialogs/searchresults.cxx
b/sc/source/ui/dialogs/searchresults.cxx
index 51c5ece..38b5bec 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -21,9 +21,9 @@
namespace sc {
-SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, Window* pParent,
sal_uInt16 nId ) :
+SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, Window* pParent,
sal_uInt16 /* nId */ ) :
ModelessDialog(pParent, "SearchResultsDialog",
"modules/scalc/ui/searchresults.ui"),
-mpBindings(_pBindings), mnId(nId), mpDoc(NULL)
+mpBindings(_pBindings), mpDoc(NULL)
{
SvSimpleTableContainer *pContainer =
get("results");
Size aControlSize(150, 120);
diff --git a/sc/source/ui/inc/searchresults.hxx
b/sc/source/ui/inc/searchresults.hxx
index efb35f8..0d6d435 100644
--- a/sc/source/ui/inc/searchresults.hxx
+++ b/sc/source/ui/inc/searchresults.hxx
@@ -23,8 +23,6 @@ class SearchResultsDlg : public ModelessDialog
{
SvSimpleTable *mpList;
SfxBindings* mpBindings;
-sal_uInt16 mnId;
-
ScDocument* mpDoc;
DECL_LINK( ListSelectHdl, void * );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
