[Libreoffice-commits] .: 2 commits - configure.in python/makefile.mk python/Python-2.6.1-dylib_dynload.patch
configure.in| 54 ++--
python/Python-2.6.1-dylib_dynload.patch | 14
python/makefile.mk |2 -
3 files changed, 26 insertions(+), 44 deletions(-)
New commits:
commit 2484811c3a004d531a6c216c0cd8ff34f6fad68c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 22 09:58:16 2012 +0100
Revert add dylib to the list of native python modules for Mac (for
pyuno.dylib)
This reverts those parts of commit f892f979ce17c70ccff5c802db17f24129628504
that add .dylib as an extension for native Python modules, which in turn was
obsoleted by 2ea723e8ce4077c7efa957d278637c4d9f32cf14 Revert 'Mac OS X uses
.dylib and not .so for python modules.' (and I verified on Mac OS X 10.6.8
that both LO's internal Pyton 2.6.1 and MacPort's python3.2 indeed import a
pyuno.so just fine).
There were additional modifications regarding pyversion stuff in the
original
commit f892f979ce17c70ccff5c802db17f24129628504 that appear unrelated and
which
I left intact.
diff --git a/python/Python-2.6.1-dylib_dynload.patch
b/python/Python-2.6.1-dylib_dynload.patch
deleted file mode 100644
index 3e44502..000
--- a/python/Python-2.6.1-dylib_dynload.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-add dylib to the extensions, to be able to load pyuno.dylib via import pyuno
misc/Python-2.6.1/Python/dynload_shlib.c 2006-01-04 02:30:17.0
+0100
-+++ misc/build/Python-2.6.1/Python/dynload_shlib.c 2011-06-11
19:42:09.0 +0200
-@@ -46,6 +46,10 @@
- {module.exe, rb, C_EXTENSION},
- {MODULE.EXE, rb, C_EXTENSION},
- #else
-+#ifdef __APPLE__
-+ {.dylib, rb, C_EXTENSION},
-+ {module.dylib, rb, C_EXTENSION},
-+#endif
- {.so, rb, C_EXTENSION},
- {module.so, rb, C_EXTENSION},
- #endif
diff --git a/python/makefile.mk b/python/makefile.mk
index 4f50ed3..be7fcbb 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -90,7 +90,7 @@ CONFIGURE_ACTION += --disable-ipv6
.ENDIF
.IF $(OS) == MACOSX
-PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch
+PATCH_FILES+=Python-2.6.1-py8067.patch
# don't build dual-arch version as OOo itself is not universal binary either
PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch
commit b96b5aff2bfb4b0c4545e0a7f52679301dfcdb52
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 22 09:55:24 2012 +0100
Allow to override --with-python=system withh $PYTHON on Mac OS X
diff --git a/configure.in b/configure.in
index 22f6945..32186ac 100644
--- a/configure.in
+++ b/configure.in
@@ -5938,7 +5938,7 @@ internal)
AC_MSG_RESULT([internal])
;;
system)
-if test $_os = Darwin -a \( $with_macosx_version_min_required = 10.4 -o
$with_macosx_version_min_required = 10.5 \); then
+if test $_os = Darwin -a -z $PYTHON -a \(
$with_macosx_version_min_required = 10.4 -o
$with_macosx_version_min_required = 10.5 \); then
AC_MSG_ERROR([Cannot use system Python, the Python in Mac OS X
$with_macosx_version_min_required is incompatible with Python3-ified pyuno])
fi
AC_MSG_RESULT([system])
@@ -5963,13 +5963,29 @@ if test $cross_compiling = yes; then
enable_python=system
fi
else
-if test $enable_python = system; then
-# This causes an error if no python command is found
-# Note that this takes the system python called just python,
-# which isn't actually what we want on MacOSX when building
-# against the 10.6 SDK. But that shouldn't matter, we
-# select the correct python command manually below anyway.
-AM_PATH_PYTHON([2.6])
+if test $enable_python = system -a -z $PYTHON; then
+if test $_os = Darwin; then
+# We already have logic above to make sure the system Python
+# is used only when building against SDK 10.6 or newer.
+
+# Make sure we use the 2.6 Python when building against the
+# 10.6 SDK.
+case $with_macosx_sdk in
+10.6)
+python_version=2.6;;
+10.7)
+python_version=2.7;;
+*)
+# ???
+python_version=2.7;;
+esac
+PYTHON=python$python_version
+
PYTHON_CFLAGS=-I/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk/System/Library/Frameworks/Python.framework/Versions/${python_version}/include/python${python_version}
+PYTHON_LIBS=-framework Python
+else
+# This causes an error if no python command is found
+AM_PATH_PYTHON([2.6])
+fi
elif test $enable_python = auto; then
dnl This allows lack of system Python
AM_PATH_PYTHON([2.6],, [:])
@@ -5983,26 +5999,6 @@ else
fi
if test $enable_python = system; then
-if test $_os = Darwin; then
-# We already have logic above to make sure the system Python
-# is used only
[Libreoffice-commits] .: canvas/inc canvas/source
canvas/inc/canvas/base/sprite.hxx |2 +-
canvas/inc/canvas/spriteredrawmanager.hxx |2 +-
canvas/source/tools/spriteredrawmanager.cxx |5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 2c7e061997202df9e602e209cf40c61606582e8e
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 22 00:31:30 2012 +0100
Fix fdo#45219 wrong transparency for animated objects.
With the attachement from said bug, and cairocanvas, sprites
are displayed multiple times above each other (which, for semi-
transparent sprites, lead to incorrect overall transparency)
diff --git a/canvas/inc/canvas/base/sprite.hxx
b/canvas/inc/canvas/base/sprite.hxx
index bb3d655..38a2270 100644
--- a/canvas/inc/canvas/base/sprite.hxx
+++ b/canvas/inc/canvas/base/sprite.hxx
@@ -103,7 +103,7 @@ namespace canvas
/** Functor providing a StrictWeakOrdering for sprite references
*/
-struct SpriteComparator
+struct SpriteWeakOrder
{
bool operator()( const Sprite::Reference rLHS,
const Sprite::Reference rRHS )
diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx
b/canvas/inc/canvas/spriteredrawmanager.hxx
index 3bf4ca6..9dc2099 100644
--- a/canvas/inc/canvas/spriteredrawmanager.hxx
+++ b/canvas/inc/canvas/spriteredrawmanager.hxx
@@ -361,7 +361,7 @@ namespace canvas
::std::sort( aSortedUpdateSprites.begin(),
aSortedUpdateSprites.end(),
- SpriteComparator() );
+ SpriteWeakOrder() );
if( isAreaUpdateOpaque( rUpdateArea,
nNumSprites ) )
diff --git a/canvas/source/tools/spriteredrawmanager.cxx
b/canvas/source/tools/spriteredrawmanager.cxx
index 72976c1..eeb4714 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -233,7 +233,7 @@ namespace canvas
// in line with the problem of having sprite state available
// for the frame before the last frame; plus, it avoids
// frequent locks of the object mutices
-SpriteComparator aSpriteComparator;
+SpriteWeakOrder aSpriteComparator;
// put all sprites that have changed content into update areas
ListOfSprites::const_iterator aCurrSprite( maSprites.begin() );
@@ -277,8 +277,7 @@ namespace canvas
VectorOfSprites::iterator aEnd=
::std::unique( aUpdatableSprites.begin(),
- aUpdatableSprites.end(),
- aSpriteComparator );
+ aUpdatableSprites.end() );
// for each unique sprite, check the change event vector,
// calculate the update operation from that, and add the
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc
vcl/inc/salobj.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 88def708899cbca0313005541a82859cda28edbd
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 22 11:17:44 2012 +0100
-Werror=unused-parameter
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index b441674..5ef548b 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -66,11 +66,11 @@ public:
virtual voidSetPosSize( long nX, long nY, long nWidth,
long nHeight ) = 0;
virtual voidShow( sal_Bool bVisible ) = 0;
-virtual voidEnable( sal_Bool nEnable ) {}
+virtual voidEnable( sal_Bool ) {}
virtual voidGrabFocus() {}
virtual voidSetBackground() {}
-virtual voidSetBackground( SalColor nSalColor ) {}
+virtual voidSetBackground( SalColor ) {}
virtual voidSetForwardKey( sal_Bool /*bEnable*/ ) {}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/nsplugin/source/makefile.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eaa2186fa15997a22600e06cf3e2cbd79ea4456d Author: Tomáš Chvátal tomas.chva...@gmail.com Date: Wed Feb 22 11:58:54 2012 +0100 fix check for older npapi to work with dmake correctly Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 7d302b5..ef7df8a 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -42,8 +42,8 @@ INCPRE+=$(MOZILLA_HEADERS_CFLAGS) INCPRE=$(SOLARINCDIR)$/npsdk .ENDIF -.IF $(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) TRUE -CXXFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 +.IF $(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) == TRUE +CFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 .ENDIF .IF $(GUI)==UNX ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 42 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
2 files changed, 31 insertions(+), 12 deletions(-)
New commits:
commit fe4cea3e8b7416151f67bc6e72e12cc6cf6a0f6d
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 11:43:25 2012 +0100
RTF: clean up border property handling
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4b1a1a7..581f912 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -146,6 +146,7 @@ static RTFSprms lcl_getLastAttributes(RTFSprms rSprms, Id
nId)
static void lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId,
RTFValue::Pointer_t pValue)
{
+RTFSprms* pAttributes = 0;
if (aStates.top().nBorderState == BORDER_PARAGRAPH_BOX)
for (int i = 0; i 4; i++)
{
@@ -156,24 +157,15 @@ static void
lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId, R
rAttributes-push_back(make_pair(nId, pValue));
}
}
+// Attributes of the last border type
else if (aStates.top().nBorderState == BORDER_PARAGRAPH)
-{
-// Attributes of the last border type
-RTFSprms rAttributes =
lcl_getLastAttributes(aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr);
-rAttributes-push_back(make_pair(nId, pValue));
-}
+pAttributes = lcl_getLastAttributes(aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr);
else if (aStates.top().nBorderState == BORDER_CELL)
-{
-// Attributes of the last border type
-RTFSprms rAttributes =
lcl_getLastAttributes(aStates.top().aTableCellSprms,
NS_ooxml::LN_CT_TcPrBase_tcBorders);
-rAttributes-push_back(make_pair(nId, pValue));
-}
+pAttributes = lcl_getLastAttributes(aStates.top().aTableCellSprms,
NS_ooxml::LN_CT_TcPrBase_tcBorders);
else if (aStates.top().nBorderState == BORDER_PAGE)
-{
-// Attributes of the last border type
-RTFSprms rAttributes =
lcl_getLastAttributes(aStates.top().aSectionSprms,
NS_ooxml::LN_EG_SectPrContents_pgBorders);
-rAttributes-push_back(make_pair(nId, pValue));
-}
+pAttributes = lcl_getLastAttributes(aStates.top().aSectionSprms,
NS_ooxml::LN_EG_SectPrContents_pgBorders);
+if (pAttributes)
+(*pAttributes)-push_back(make_pair(nId, pValue));
}
// NEEDSWORK: DocxAttributeOutput's impl_AppendTwoDigits does the same.
commit 343b52ee76f1a88a27007319af644dcce76536cc
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 11:38:29 2012 +0100
implement RTF import of non-box paragraph borders
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 806b43f..4b1a1a7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -146,7 +146,7 @@ static RTFSprms lcl_getLastAttributes(RTFSprms rSprms, Id
nId)
static void lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId,
RTFValue::Pointer_t pValue)
{
-if (aStates.top().nBorderState == BORDER_PARAGRAPH)
+if (aStates.top().nBorderState == BORDER_PARAGRAPH_BOX)
for (int i = 0; i 4; i++)
{
RTFValue::Pointer_t p =
aStates.top().aParagraphSprms.find(lcl_getParagraphBorder(i));
@@ -156,6 +156,12 @@ static void
lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId, R
rAttributes-push_back(make_pair(nId, pValue));
}
}
+else if (aStates.top().nBorderState == BORDER_PARAGRAPH)
+{
+// Attributes of the last border type
+RTFSprms rAttributes =
lcl_getLastAttributes(aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr);
+rAttributes-push_back(make_pair(nId, pValue));
+}
else if (aStates.top().nBorderState == BORDER_CELL)
{
// Attributes of the last border type
@@ -1772,7 +1778,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcLeft,
pValue));
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcBottom,
pValue));
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcRight,
pValue));
-m_aStates.top().nBorderState = BORDER_PARAGRAPH;
+m_aStates.top().nBorderState = BORDER_PARAGRAPH_BOX;
}
break;
case RTF_LTRSECT:
@@ -1849,6 +1855,26 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().nBorderState = BORDER_PAGE;
}
break;
+case RTF_BRDRT:
+case RTF_BRDRL:
+case RTF_BRDRB:
+case RTF_BRDRR:
+{
+RTFSprms aAttributes;
+
[Libreoffice-commits] .: bug/bug
bug/bug/bug.js |9 +
bug/bug/test.js |5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 8a19cf7ea488f6b16989e7e49d18bef2452785af
Author: Kate Goss katherine.g...@gmail.com
Date: Sat Feb 18 20:49:17 2012 +
fdo#42006: Make Bugzilla Assistant tests pass in IE8
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index b2e4ed6..d670092 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -208,10 +208,11 @@
element.show();
}
},
-
-state_submit_error_regexps: [/CLASS=THROW_ERROR([^]*)/i, /FONT
SIZE=\\+2\([^]*)/i, // bugzilla 4
- /DIV CLASS=\BOX\\s+P([^]+)/i],
// bugzilla = 4
-state_submit_success_regexp: /TITLEBug ([0-9]+)/i,
+// Making the double quotes optional caters for differing browser
+// behaviour with jquery .text() - IE8 removes double quotes.
+state_submit_error_regexps: [/CLASS=?THROW_ERROR?([^]*)/i, /FONT
SIZE=\?\+2\?([^]*)/i, // bugzilla 4
+ /DIV CLASS=\?BOX\?\s+P([^]+)/i],
// bugzilla = 4
+state_submit_success_regexp: /Bug ([0-9]+)/i,
state_submit_element: 'html',
state_submit: function() {
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 93daea0..73b194b 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -274,12 +274,13 @@ test(state_submit, function() {
$.bug.state_submit_element = 'div'; // because html can't be inserted in
the dom
-$('#submissionoutput').html('divdivtitleBug ' + bug + '
Submitted/title/div/div');
+// title cannot be inserted by IE8
+$('#submissionoutput').html('divdivBug ' + bug + '
Submitted/div/div');
$('#submissionoutput').load();
equal($('.bug', element).text(), bug, 'bug number');
ok(!element.hasClass('inprogress'), 'is no longer progress');
-var error = ' ERROR ';
+var error = 'ERROR';
equal($('.error').text(), '', 'error is not set');
// make sure you enclose the useful elements with divdiv ...
/div/div
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/JavaClassSet.mk | 10 +- solenv/gbuild/JunitTest.mk|8 2 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 19ea1b173ae9004a438903d1cb4ac197d27bacee Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Dec 9 14:31:53 2011 +0200 Don't misuse CLASSPATH for what goes into the -cp option to javac CLASSPATH is supposed to show where to find the classes needed by Java programs running at build time. The -cp switch to javac tells where to find classes referenced by the code being compiled. These are different things. (But it doesn't seem to have mattered much in our build system.) So use T_CP instead, named in the same fashion as T_CXXFLAGS etc. But... for some reason this change, which as such should be just more or less cosmetic, also fixes a build problem in the scripting module on Windows, seen by Noel Grandin (http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/19016 ) and me. Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index d8c648e..9104b9c 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -43,7 +43,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(filter-out $(JARDEPS),$(4) \ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ $(gb_JavaClassSet_JAVACDEBUG) \ - -cp $(CLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2)) \ + -cp $(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2)) \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE ) \ rm -f $$RESPONSEFILE \ @@ -60,8 +60,8 @@ $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) -# no initialization of scoped variable CLASSPATH as it is inherited from controlling instance (e.g. JUnitTest, Jar) # UGLY: cannot use target local variable for REPO because it's needed in prereq +# No idea what above comment means, and whether still relevant define gb_JavaClassSet_JavaClassSet $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := endef @@ -81,7 +81,7 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil endef define gb_JavaClassSet_set_classpath -$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)) endef @@ -89,13 +89,13 @@ endef # build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_add_jar $(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) endef # this does not generate dependency on the jar define gb_JavaClassSet_add_system_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2))) +$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 5afe595..177cad6 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -47,7 +47,7 @@ $(call gb_JunitTest_get_target,%) : rm -rf $(call gb_JunitTest_get_userdir,$*) \ mkdir -p $(call gb_JunitTest_get_userdir,$*) \ (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \ --cp $(CLASSPATH) \ +-cp $(T_CP) \ $(DEFS) \ org.junit.runner.JUnitCore \ $(CLASSES) $@.log 21 || \ @@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) @@ -105,12 +105,12 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile)) endef define gb_JunitTest_set_classpath -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2) +$(call gb_JunitTest_get_target,$(1)) : T_CP :=
[Libreoffice-commits] .: readlicense_oo/docs
readlicense_oo/docs/readme/readme.xrm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5f34354fae4675d21be83261de8e82a5f8da2f09 Author: Andras Timar ati...@suse.com Date: Wed Feb 22 13:54:13 2012 +0100 fix mailing list addresses diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm index e4fd3ab..5280b49 100755 --- a/readlicense_oo/docs/readme/readme.xrm +++ b/readlicense_oo/docs/readme/readme.xrm @@ -248,11 +248,11 @@ /li li - p id=subscribelist2 xml:lang=en-USMain user list: us...@libreoffice.org *easy way to lurk on discussions* (heavy traffic)/p + p id=subscribelist2 xml:lang=en-USMain user list: us...@global.libreoffice.org *easy way to lurk on discussions* (heavy traffic)/p /li li - p id=subscribelist3 xml:lang=en-USMarketing project: market...@libreoffice.org *beyond development* (getting heavy)/p + p id=subscribelist3 xml:lang=en-USMarketing project: market...@global.libreoffice.org *beyond development* (getting heavy)/p /li li ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dptabres.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00f022bac10629d35eb6f073c3dfe90e120202b5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Feb 22 14:42:54 2012 +0100 fix misleading comment caused by previous commit diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 7d98440..421c17d 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -174,7 +174,7 @@ static sal_Bool lcl_IsLess( const ScDPDataMember* pDataMember1, const ScDPDataMe sal_Bool bError1 = pAgg1 pAgg1-HasError(); sal_Bool bError2 = pAgg2 pAgg2-HasError(); if ( bError1 ) -return sal_False; // equal +return sal_False; // errors are always sorted at the end else if ( bError2 ) return sal_True;// errors are always sorted at the end else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source svtools/source svx/source sw/source
sc/source/ui/src/popup.src |6 ++
svtools/source/graphic/grfmgr.cxx |5 +
svtools/source/graphic/provider.cxx |3 +++
svx/source/xml/xmlgrhlp.cxx |5 +
sw/source/core/graphic/ndgrf.cxx| 33 +
5 files changed, 52 insertions(+)
New commits:
commit aff6db70245a74039b5331810d3ff654b1f6af63
Author: Greggory Hernandez greggory...@gmail.com
Date: Wed Feb 22 14:08:57 2012 +
fdo#37210 - UI: Calc usability improvement: Merge cells on right mouse click
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 24e9c58..441c336 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -76,6 +76,12 @@ Menu RID_POPUP_CELLS
HelpId = CMD_SID_DELETE ;
Text [ en-US ] = Delete C~ontents... ;
};
+MenuItem
+{
+Identifier = FID_MERGE_ON ;
+HelpId = CMD_FID_MERGE_ON ;
+Text [ en-US ] = ~Merge Cells... ;
+};
//--
MenuItem { Separator = TRUE ; };
//--
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 7c2de86..2124d62 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -422,12 +422,17 @@ String GraphicObject::GetLink() const
void GraphicObject::SetUserData()
{
+fprintf (stderr, SetUserData to null from '%s'\n,
+ mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
if( mpUserData )
delete mpUserData, mpUserData = NULL;
}
void GraphicObject::SetUserData( const String rUserData )
{
+fprintf (stderr, SetUserData to '%s' from '%s'\n,
+ rtl::OUStringToOString(rUserData, RTL_TEXTENCODING_UTF8).getStr(),
+ mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
delete mpUserData, mpUserData = new String( rUserData );
}
diff --git a/svtools/source/graphic/provider.cxx
b/svtools/source/graphic/provider.cxx
index d5bcf46..185e9dc 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -867,6 +867,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
if( pGraphic ( pGraphic-GetType() != GRAPHIC_NONE ) )
{
+fprintf (stderr, provider.cxx - write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
::Graphic aGraphic( *pGraphic );
ImplApplyFilterData( aGraphic, aFilterDataSeq );
@@ -884,6 +885,8 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
}
aMemStrm.Seek( STREAM_SEEK_TO_END );
pOStm-Write( aMemStrm.GetData(), aMemStrm.Tell() );
+
+fprintf (stderr, provider.cxx - after write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
}
}
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index d73c19e..9f2c6c8 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -621,6 +621,8 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
}
else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE )
{
+fprintf (stderr, xmlgrhlp.cxx - write meta-file !
0x%lx\n,
+ (long)aGraphic.GetChecksum() );
pStream-SetVersion( SOFFICE_FILEFORMAT_8 );
pStream-SetCompressMode( COMPRESSMODE_ZBITMAP );
@@ -643,6 +645,9 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
rMtf.Write( *pStream,
GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC );
bRet = ( pStream-GetError() == 0 );
+
+fprintf (stderr, xmlgrhlp.cxx - done write meta-file !
0x%lx\n,
+ (long)aGraphic.GetChecksum() );
}
}
uno::Reference embed::XTransactedObject xStorage(
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 151d795..907e1f0 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -63,6 +63,14 @@
using namespace com::sun::star;
+static void dbg (SwGrfNode *pNode)
+{
+fprintf (stderr, SwGrfNode created: '%s' 0x%lx\n,
+ rtl::OUStringToOString(pNode-GetGrfObj().GetUserData(),
+RTL_TEXTENCODING_UTF8).getStr(),
+ (long)pNode-GetGrf().GetChecksum());
+}
+
//
// SwGrfNode
//
@@ -83,6 +91,7 @@ SwGrfNode::SwGrfNode(
bGrafikArrived = sal_True;
ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - distro-configs/LibreOfficeLinux.conf distro-configs/OxygenOfficeLinux.conf external/gcc3_specific scp2/prj scp2/source scp2/util setup_n
distro-configs/LibreOfficeLinux.conf |1 distro-configs/OxygenOfficeLinux.conf |1 external/gcc3_specific/makefile.mk|2 scp2/prj/build.lst|3 - scp2/source/ooo/ure.scp | 30 - scp2/source/stdlibs/file_stdlibs.scp | 58 ++ scp2/source/stdlibs/makefile.mk | 52 +++ scp2/source/stdlibs/module_stdlibs.scp| 47 + scp2/source/stdlibs/module_stdlibs.ulf| 32 ++ scp2/util/makefile.mk |5 ++ setup_native/source/packinfo/packinfo_ure.txt | 12 + 11 files changed, 211 insertions(+), 32 deletions(-) New commits: commit e59ae28a2c3ae8a5f2e3e2547fd879bb6217dcfc Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Feb 22 10:12:42 2012 +0100 Put stdlibs into separate optional package on Linux Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index b26c07d..9b82432 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -20,10 +20,11 @@ cpscp2\source\python nmake-all cp_python cp_langmacros c cpscp2\source\quickstart nmake-allcp_quickstart cp_langmacros cp_langtemplates NULL cpscp2\source\sdkoo nmake-allcp_sdkoo cp_langmacros cp_langtemplates NULL cpscp2\source\smoketest nmake-allcp_smoketest cp_langmacros cp_langtemplates NULL +cpscp2\source\stdlibs nmake-allcp_stdlibs cp_langmacros cp_langtemplates NULL cpscp2\source\writer nmake-allcp_writer cp_langmacros cp_langtemplates NULL cpscp2\source\basenmake-allcp_base cp_langmacros cp_langtemplates NULL cpscp2\source\xsltfilter nmake-allcp_xsltfilter cp_langmacros cp_langtemplates NULL cpscp2\source\winexplorerext nmake-allcp_winexplorerext cp_langmacros cp_langtemplates NULL cpscp2\source\onlineupdatenmake-allcp_update cp_langmacros cp_langtemplates NULL cpscp2\source\accessories nmake-allcp_accessories cp_langmacros NULL -cpscp2\util nmake-allcp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL +cpscp2\util nmake-allcp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_stdlibs cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index be2418f..006e001 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -880,36 +880,6 @@ File gid_File_Dl_Stlport End #endif -#if defined _gcc3 !(defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) -File gid_File_Dl_GccS -LIB_FILE_BODY; -Dir = SCP2_URE_DL_DIR; -#ifdef AIX -Name = libgcc_s.a; -#else -Name = SCP2_URE_DL_VER(gcc_s, STRING(SHORTSTDC3)); -#endif -Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = C601D04B-2194-4F1B-BB09-7B4930D6E1DB; -End -#endif - -#if defined _gcc3 !(defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) -File gid_File_Dl_Stdcpp -Dir = SCP2_URE_DL_DIR; -LIB_FILE_BODY; -#ifdef AIX -Name = libstdc++.a; -#else -Name = SCP2_URE_DL_VER(stdc++, STRING(SHORTSTDCPP3)); -#endif -Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -// CompID = 89740D6A-38EE-41AF-A6A2-A8F7ABBE4996; -End -#endif - #if defined(WNT) defined( _gcc3 ) #if defined(MINGW_GCCDLL) diff --git a/scp2/source/stdlibs/file_stdlibs.scp b/scp2/source/stdlibs/file_stdlibs.scp new file mode 100644 index 000..f1bd590 --- /dev/null +++ b/scp2/source/stdlibs/file_stdlibs.scp @@ -0,0 +1,58 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the License); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an AS IS basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. +
[Libreoffice-commits] .: svtools/source svx/source sw/source
svtools/source/graphic/grfmgr.cxx |5 -
svtools/source/graphic/provider.cxx |3 ---
svx/source/xml/xmlgrhlp.cxx |5 -
sw/source/core/graphic/ndgrf.cxx| 33 -
4 files changed, 46 deletions(-)
New commits:
commit fdb9d721c18fb3c3f81f7384ad544e72e969f448
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 22 14:24:52 2012 +
revert slew of debug code committed in error
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 2124d62..7c2de86 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -422,17 +422,12 @@ String GraphicObject::GetLink() const
void GraphicObject::SetUserData()
{
-fprintf (stderr, SetUserData to null from '%s'\n,
- mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
if( mpUserData )
delete mpUserData, mpUserData = NULL;
}
void GraphicObject::SetUserData( const String rUserData )
{
-fprintf (stderr, SetUserData to '%s' from '%s'\n,
- rtl::OUStringToOString(rUserData, RTL_TEXTENCODING_UTF8).getStr(),
- mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
delete mpUserData, mpUserData = new String( rUserData );
}
diff --git a/svtools/source/graphic/provider.cxx
b/svtools/source/graphic/provider.cxx
index 185e9dc..d5bcf46 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -867,7 +867,6 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
if( pGraphic ( pGraphic-GetType() != GRAPHIC_NONE ) )
{
-fprintf (stderr, provider.cxx - write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
::Graphic aGraphic( *pGraphic );
ImplApplyFilterData( aGraphic, aFilterDataSeq );
@@ -885,8 +884,6 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
}
aMemStrm.Seek( STREAM_SEEK_TO_END );
pOStm-Write( aMemStrm.GetData(), aMemStrm.Tell() );
-
-fprintf (stderr, provider.cxx - after write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
}
}
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 9f2c6c8..d73c19e 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -621,8 +621,6 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
}
else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE )
{
-fprintf (stderr, xmlgrhlp.cxx - write meta-file !
0x%lx\n,
- (long)aGraphic.GetChecksum() );
pStream-SetVersion( SOFFICE_FILEFORMAT_8 );
pStream-SetCompressMode( COMPRESSMODE_ZBITMAP );
@@ -645,9 +643,6 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
rMtf.Write( *pStream,
GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC );
bRet = ( pStream-GetError() == 0 );
-
-fprintf (stderr, xmlgrhlp.cxx - done write meta-file !
0x%lx\n,
- (long)aGraphic.GetChecksum() );
}
}
uno::Reference embed::XTransactedObject xStorage(
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 907e1f0..151d795 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -63,14 +63,6 @@
using namespace com::sun::star;
-static void dbg (SwGrfNode *pNode)
-{
-fprintf (stderr, SwGrfNode created: '%s' 0x%lx\n,
- rtl::OUStringToOString(pNode-GetGrfObj().GetUserData(),
-RTL_TEXTENCODING_UTF8).getStr(),
- (long)pNode-GetGrf().GetChecksum());
-}
-
//
// SwGrfNode
//
@@ -91,7 +83,6 @@ SwGrfNode::SwGrfNode(
bGrafikArrived = sal_True;
ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
-dbg(this);
}
SwGrfNode::SwGrfNode( const SwNodeIndex rWhere,
@@ -109,7 +100,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex rWhere,
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
bFrameInPaint = bScaleImageMap = sal_False;
bGrafikArrived = sal_True;
-dbg(this);
}
// Konstruktor fuer den SW/G-Reader. Dieser ctor wird verwendet,
@@ -145,7 +135,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex rWhere,
((SwBaseLink*)refLink)-Connect();
}
}
-dbg(this);
}
sal_Bool SwGrfNode::ReRead(
@@ -398,9 +387,6 @@ sal_Bool SwGrfNode::ImportGraphic( SvStream rStrm )
const String aGraphicURL( aGrfObj.GetUserData() );
[Libreoffice-commits] .: 2 commits - sfx2/source sw/qa
sfx2/source/doc/new.cxx | 12
sw/qa/extras/rtftok/data/n695479.rtf |1 +
sw/qa/extras/rtftok/rtftok.cxx | 11 +++
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit d453788ac0476cc02b929b0907718ca771d6d956
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 15:49:36 2012 +0100
SfxNewFileDialog_Impl: drop unneeded includes
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index da13a06..3be70a3 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -28,7 +28,6 @@
#include comphelper/string.hxx
#include sfx2/new.hxx
-#include vcl/gdimtf.hxx
#include vcl/msgbox.hxx
#include vcl/morebtn.hxx
#include svtools/svmedit.hxx
@@ -41,24 +40,13 @@
#include new.hrc
#include doc.hrc
-#include sfx2/sfx.hrc
-#include helpid.hrc
-#include sfxtypes.hxx
#include sfx2/app.hxx
-#include sfx2/viewfrm.hxx
-#include sfx2/docfac.hxx
#include sfx2/objsh.hxx
-#include fltfnc.hxx
-#include sfx2/viewsh.hxx
-#include sfx2/viewfac.hxx
#include sfx2/sfxresid.hxx
#include sfx2/docfile.hxx
#include preview.hxx
#include sfx2/printer.hxx
#include vcl/waitobj.hxx
-#include vcl/virdev.hxx
-#include vcl/jobset.hxx
-#include svtools/accessibilityoptions.hxx
// Draw modes
#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT)
commit 9fec1e59fa7e92cf91eaf8376f30160edcb86242
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 13:05:37 2012 +0100
testcase for non-box paragraph borders
diff --git a/sw/qa/extras/rtftok/data/n695479.rtf
b/sw/qa/extras/rtftok/data/n695479.rtf
index 213f868..5fe7e45 100644
--- a/sw/qa/extras/rtftok/data/n695479.rtf
+++ b/sw/qa/extras/rtftok/data/n695479.rtf
@@ -1,6 +1,7 @@
{\rtf1
\paperw12240\paperh15840\margl360\margr360\margt360\margb302\gutter0\ltrsect
\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\pvpg\posx116\posy2167\absh-300\absw5134\overlay\faauto\rin0\lin0\itap0
+\brdrb\brdrdb\brdrw15\brsp20
\rtlch\fcs1 \af0\afs19\alang1025 \ltrch\fcs0
\fs19\lang1033\langfe1038\loch\af0\hich\af0\dbch\af31505\cgrid\langnp1033\langfenp1038
{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0
\fs18\cf1\lang1038\langfe1038\langnp1038\insrsid10974703
\hich\af0\dbch\af31505\loch\f0 first
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index a1f6521..eb64e0a 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -28,6 +28,8 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/BorderLineStyle.hpp
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/SizeType.hpp
#include com/sun/star/text/XTextDocument.hpp
@@ -198,6 +200,15 @@ void RtfModelTest::testN695479()
uno::Referencetext::XTextRange xRange(xTextContent-getAnchor(),
uno::UNO_QUERY);
uno::Referencetext::XText xText(xRange-getText(),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(RTL_CONSTASCII_USTRINGPARAM(plain)),
xText-getString());
+
+if (i == 0)
+{
+// Additonally, the frist frame should have double border at
the bottom.
+aValue =
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BottomBorder)));
+table::BorderLine2 aBorder;
+aValue = aBorder;
+CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE,
aBorder.LineStyle);
+}
}
else if
(xServiceInfo-supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source dbaccess/source desktop/source sal/CppunitTest_sal_rtl_strings.mk sal/inc sal/qa sal/rtl svl/source
basic/source/uno/namecont.cxx | 14 -
dbaccess/source/ui/browser/unodatbr.cxx |2
desktop/source/deployment/inc/dp_misc.h | 18 -
desktop/source/deployment/registry/configuration/dp_configuration.cxx |4
sal/CppunitTest_sal_rtl_strings.mk|1
sal/inc/rtl/ustring.hxx | 62
++
sal/inc/sal/log-areas.dox |4
sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 91
++
sal/rtl/source/ustring.cxx|3
svl/source/misc/inethist.cxx |4
10 files changed, 172 insertions(+), 31 deletions(-)
New commits:
commit f150ed241ff796a25bd1a797155104198b415f18
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Feb 22 15:35:41 2012 +0100
OUString ctor for string literals without RTL_CONSTASCII stuff
http://lists.freedesktop.org/archives/libreoffice/2012-February/025662.html
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index db0bf66..db72a4f 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1001,13 +1001,13 @@ sal_Bool SfxLibraryContainer::init_Impl(
INetURLObject aUserBasicInetObj( String(maLibraryPath).GetToken(1) );
OUString aStandardStr( RTL_CONSTASCII_USTRINGPARAM(Standard) );
-static char strPrevFolderName_1[] = __basic_80;
-static char strPrevFolderName_2[] = __basic_80_2;
+static char const strPrevFolderName_1[] = __basic_80;
+static char const strPrevFolderName_2[] = __basic_80_2;
INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj );
aPrevUserBasicInetObj_1.removeSegment();
INetURLObject aPrevUserBasicInetObj_2 = aPrevUserBasicInetObj_1;
-aPrevUserBasicInetObj_1.Append( strPrevFolderName_1 );
-aPrevUserBasicInetObj_2.Append( strPrevFolderName_2 );
+aPrevUserBasicInetObj_1.Append( rtl::OString( strPrevFolderName_1 ));
+aPrevUserBasicInetObj_2.Append( rtl::OString( strPrevFolderName_2 ));
// #i93163
bool bCleanUp = false;
@@ -1072,7 +1072,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
String aFolderUserBasic = aUserBasicInetObj.GetMainURL(
INetURLObject::NO_DECODE );
INetURLObject aUserBasicTmpInetObj( aUserBasicInetObj );
aUserBasicTmpInetObj.removeSegment();
-aUserBasicTmpInetObj.Append( __basic_tmp );
+aUserBasicTmpInetObj.Append( rtl::OString( __basic_tmp ));
String aFolderTmp = aUserBasicTmpInetObj.GetMainURL(
INetURLObject::NO_DECODE );
mxSFI-move( aFolderUserBasic, aFolderTmp );
@@ -1195,10 +1195,10 @@ sal_Bool SfxLibraryContainer::init_Impl(
{
SAL_WARN(basic, Upgrade of Basic installation failed somehow);
-static char strErrorSavFolderName[] = __basic_80_err;
+static const char strErrorSavFolderName[] = __basic_80_err;
INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj );
aPrevUserBasicInetObj_Err.removeSegment();
-aPrevUserBasicInetObj_Err.Append( strErrorSavFolderName );
+aPrevUserBasicInetObj_Err.Append( rtl::OString(
strErrorSavFolderName ));
String aPrevFolder_Err = aPrevUserBasicInetObj_Err.GetMainURL(
INetURLObject::NO_DECODE );
bool bSaved = false;
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 6e31141..705cb24 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1916,7 +1916,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const
Sequence PropertyValue
break;
case ID_TREE_CLOSE_CONN:
-openHelpAgent( HID_DSBROWSER_DISCONNECTING );
+openHelpAgent( rtl::OString( HID_DSBROWSER_DISCONNECTING ));
closeConnection( m_pTreeView-getListBox().GetRootLevelParent(
m_pTreeView-getListBox().GetCurEntry() ) );
break;
diff --git a/desktop/source/deployment/inc/dp_misc.h
b/desktop/source/deployment/inc/dp_misc.h
index 9e91253..29fd140 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -128,15 +128,6 @@ oslProcess raiseProcess( ::rtl::OUString const appURL,
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
void writeConsole(::rtl::OUString const sText);
-/** writes the argument string to the console.
-On Linux/Unix/etc. the string is passed into fprintf without any
conversion.
-On Windows the string is converted to UTF16 assuming the argument is UTF8
-encoded. The UTF16 string is written to stdout with WriteFile. unopkg.com
-reads the data and
[Libreoffice-commits] .: redland/raptor
redland/raptor/makefile.mk |3
redland/raptor/raptor-1.4.18.entities.patch | 383
2 files changed, 385 insertions(+), 1 deletion(-)
New commits:
commit cef1ba2d58cb8a6928055b322c88a79b5b5c0ad4
Author: Petr Mladek pmla...@suse.cz
Date: Wed Feb 22 16:55:40 2012 +0100
Disable problematic reading of external entities in raptor
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 214ee2d..292a340 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -58,7 +58,8 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
$(TARFILE_NAME).patch.rindex \
-raptor-aix.patch
+raptor-aix.patch \
+$(TARFILE_NAME).entities.patch
.IF $(CROSS_COMPILING)==YES
OOO_PATCH_FILES += \
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
new file mode 100644
index 000..4964dae
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -0,0 +1,383 @@
+--- misc/raptor-1.4.18/src/raptor.h.old2008-06-20 07:47:38.0
+0200
misc/build/raptor-1.4.18/src/raptor.h 2012-02-15 16:54:21.0
+0100
+@@ -376,6 +376,7 @@ typedef struct {
+ * @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data
+ * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples
it finds (none, rdf-xml, atom-triples)
+ * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI. If given, generate an
Atom Entry Document with the item having the given URI, otherwise generate an
Atom Feed Document with any items found.
++ * @RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: When reading XML, load external
entities.
+ * @RAPTOR_FEATURE_LAST: Internal
+ *
+ * Raptor parser, serializer or XML writer features.
+@@ -416,7 +417,8 @@ typedef enum {
+ RAPTOR_FEATURE_JSON_EXTRA_DATA,
+ RAPTOR_FEATURE_RSS_TRIPLES,
+ RAPTOR_FEATURE_ATOM_ENTRY_URI,
+- RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_ATOM_ENTRY_URI
++ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES,
++ RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES
+ } raptor_feature;
+
+
+--- misc/raptor-1.4.18/src/raptor_feature.c.old2008-06-05
08:54:16.0 +0200
misc/build/raptor-1.4.18/src/raptor_feature.c 2012-02-15
16:55:09.0 +0100
+@@ -89,7 +89,8 @@ static const struct
+ { RAPTOR_FEATURE_JSON_CALLBACK , 6, jsonCallback, JSON serializer
callback },
+ { RAPTOR_FEATURE_JSON_EXTRA_DATA , 6, jsonExtraData, JSON serializer
extra data },
+ { RAPTOR_FEATURE_RSS_TRIPLES , 6, rssTriples, Atom/RSS serializer
writes extra RDF triples },
+- { RAPTOR_FEATURE_ATOM_ENTRY_URI, 6, atomEntryUri, Atom serializer
Entry URI }
++ { RAPTOR_FEATURE_ATOM_ENTRY_URI, 6, atomEntryUri, Atom serializer
Entry URI },
++ { RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, 1, loadExternalEntities, Load
external XML entities. }
+ };
+
+
+--- misc/raptor-1.4.18/src/raptor_internal.h.old 2008-06-03
07:04:09.0 +0200
misc/build/raptor-1.4.18/src/raptor_internal.h 2012-02-15
16:52:08.0 +0100
+@@ -983,6 +983,14 @@ struct raptor_sax2_s {
+
+ /* base URI for resolving relative URIs or xml:base URIs */
+ raptor_uri* base_uri;
++
++ /* call SAX2 handlers if non-0 */
++ int enabled;
++
++ /* FEATURE:
++ * non 0 if XML entities should be loaded
++ */
++ int feature_load_external_entities;
+ };
+
+ int raptor_sax2_init(void);
+--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.0
+0200
misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15
16:52:08.0 +0100
+@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u
+
+ static xmlParserInputPtr
+ raptor_libxml_resolveEntity(void* user_data,
+-const xmlChar *publicId, const xmlChar *systemId)
{
+- raptor_sax2* sax2=(raptor_sax2*)user_data;
+- return libxml2_resolveEntity(sax2-xc, publicId, systemId);
++const xmlChar *publicId, const xmlChar *systemId)
++{
++ raptor_sax2* sax2 = (raptor_sax2*)user_data;
++ xmlParserCtxtPtr ctxt = sax2-xc;
++ const unsigned char *uri_string = NULL;
++ xmlParserInputPtr entity_input;
++ int load_entity = 0;
++
++ if(ctxt-input)
++uri_string = (const unsigned char *)ctxt-input-filename;
++
++ if(!uri_string)
++uri_string = (const unsigned char *)ctxt-directory;
++
++ load_entity = sax2-feature_load_external_entities;
++
++ if(load_entity) {
++entity_input = xmlLoadExternalEntity((const char*)uri_string,
++ (const char*)publicId,
++ ctxt);
++ } else {
++RAPTOR_DEBUG4(Not loading entity URI %s by policy for publicId '%s'
systemId '%s'\n, uri_string, publicId, systemId);
++ }
++
++ return entity_input;
+ }
+
+
+ static xmlEntityPtr
+-raptor_libxml_getEntity(void* user_data, const xmlChar *name) {
+-
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - redland/raptor
redland/raptor/makefile.mk |3
redland/raptor/raptor-1.4.18.entities.patch | 383
2 files changed, 385 insertions(+), 1 deletion(-)
New commits:
commit 5aaf0c9cc458f4e4bd6026f54b8251ed7b89bb54
Author: Petr Mladek pmla...@suse.cz
Date: Wed Feb 22 16:55:40 2012 +0100
Disable problematic reading of external entities in raptor
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 4201a60..f214191 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -58,7 +58,8 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
$(TARFILE_NAME).patch.rindex \
-raptor-aix.patch
+raptor-aix.patch \
+$(TARFILE_NAME).entities.patch
.IF $(CROSS_COMPILING)==YES
OOO_PATCH_FILES += \
diff --git a/redland/raptor/raptor-1.4.18.entities.patch
b/redland/raptor/raptor-1.4.18.entities.patch
new file mode 100644
index 000..4964dae
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.entities.patch
@@ -0,0 +1,383 @@
+--- misc/raptor-1.4.18/src/raptor.h.old2008-06-20 07:47:38.0
+0200
misc/build/raptor-1.4.18/src/raptor.h 2012-02-15 16:54:21.0
+0100
+@@ -376,6 +376,7 @@ typedef struct {
+ * @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data
+ * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples
it finds (none, rdf-xml, atom-triples)
+ * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI. If given, generate an
Atom Entry Document with the item having the given URI, otherwise generate an
Atom Feed Document with any items found.
++ * @RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: When reading XML, load external
entities.
+ * @RAPTOR_FEATURE_LAST: Internal
+ *
+ * Raptor parser, serializer or XML writer features.
+@@ -416,7 +417,8 @@ typedef enum {
+ RAPTOR_FEATURE_JSON_EXTRA_DATA,
+ RAPTOR_FEATURE_RSS_TRIPLES,
+ RAPTOR_FEATURE_ATOM_ENTRY_URI,
+- RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_ATOM_ENTRY_URI
++ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES,
++ RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES
+ } raptor_feature;
+
+
+--- misc/raptor-1.4.18/src/raptor_feature.c.old2008-06-05
08:54:16.0 +0200
misc/build/raptor-1.4.18/src/raptor_feature.c 2012-02-15
16:55:09.0 +0100
+@@ -89,7 +89,8 @@ static const struct
+ { RAPTOR_FEATURE_JSON_CALLBACK , 6, jsonCallback, JSON serializer
callback },
+ { RAPTOR_FEATURE_JSON_EXTRA_DATA , 6, jsonExtraData, JSON serializer
extra data },
+ { RAPTOR_FEATURE_RSS_TRIPLES , 6, rssTriples, Atom/RSS serializer
writes extra RDF triples },
+- { RAPTOR_FEATURE_ATOM_ENTRY_URI, 6, atomEntryUri, Atom serializer
Entry URI }
++ { RAPTOR_FEATURE_ATOM_ENTRY_URI, 6, atomEntryUri, Atom serializer
Entry URI },
++ { RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, 1, loadExternalEntities, Load
external XML entities. }
+ };
+
+
+--- misc/raptor-1.4.18/src/raptor_internal.h.old 2008-06-03
07:04:09.0 +0200
misc/build/raptor-1.4.18/src/raptor_internal.h 2012-02-15
16:52:08.0 +0100
+@@ -983,6 +983,14 @@ struct raptor_sax2_s {
+
+ /* base URI for resolving relative URIs or xml:base URIs */
+ raptor_uri* base_uri;
++
++ /* call SAX2 handlers if non-0 */
++ int enabled;
++
++ /* FEATURE:
++ * non 0 if XML entities should be loaded
++ */
++ int feature_load_external_entities;
+ };
+
+ int raptor_sax2_init(void);
+--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.0
+0200
misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15
16:52:08.0 +0100
+@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u
+
+ static xmlParserInputPtr
+ raptor_libxml_resolveEntity(void* user_data,
+-const xmlChar *publicId, const xmlChar *systemId)
{
+- raptor_sax2* sax2=(raptor_sax2*)user_data;
+- return libxml2_resolveEntity(sax2-xc, publicId, systemId);
++const xmlChar *publicId, const xmlChar *systemId)
++{
++ raptor_sax2* sax2 = (raptor_sax2*)user_data;
++ xmlParserCtxtPtr ctxt = sax2-xc;
++ const unsigned char *uri_string = NULL;
++ xmlParserInputPtr entity_input;
++ int load_entity = 0;
++
++ if(ctxt-input)
++uri_string = (const unsigned char *)ctxt-input-filename;
++
++ if(!uri_string)
++uri_string = (const unsigned char *)ctxt-directory;
++
++ load_entity = sax2-feature_load_external_entities;
++
++ if(load_entity) {
++entity_input = xmlLoadExternalEntity((const char*)uri_string,
++ (const char*)publicId,
++ ctxt);
++ } else {
++RAPTOR_DEBUG4(Not loading entity URI %s by policy for publicId '%s'
systemId '%s'\n, uri_string, publicId, systemId);
++ }
++
++ return entity_input;
+ }
+
+
+ static xmlEntityPtr
[Libreoffice-commits] .: sw/source
sw/source/filter/xml/xmltexte.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0389b77a3cbea09ddbae238d7934d4c6349a8d37
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 22 16:05:47 2012 +
fdo#33393 - tentative workaround for autosave image loss
cf. lengthy analysis in the bug, this appears to merit wider testing
for 3.5.1 RC1 and wouldn't be sensible without that, so commit early.
diff --git a/sw/source/filter/xml/xmltexte.cxx
b/sw/source/filter/xml/xmltexte.cxx
index c62bce3..5c89944 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -221,7 +221,9 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
{
String aNewURL( RTL_CONSTASCII_USTRINGPARAM(vnd.sun.star.Package:) );
aNewURL += String(rURL);
-pGrfNd-SetNewStreamName( aNewURL );
+
+// This is nonsensical.
+//pGrfNd-SetNewStreamName( aNewURL );
// #i15411# save-as will swap all graphics in; we need to swap
// them out again, to prevent excessive memory use
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0915f1b3d77afa694a2ca692aec307846827da99
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 17:06:18 2012 +0100
fdo#42465 fix RTF import of unicode characters with backwards compatibility
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 581f912..f293bf6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -732,6 +732,7 @@ int RTFDocumentImpl::resolveChars(char ch)
OStringBuffer aBuf;
bool bUnicodeChecked = false;
+bool bSkipped = false;
while(!Strm().IsEof() ch != '{' ch != '}' ch != '\\')
{
if (ch != 0x0d ch != 0x0a)
@@ -746,7 +747,10 @@ int RTFDocumentImpl::resolveChars(char ch)
aBuf.append(ch);
}
else
+{
+bSkipped = true;
m_aStates.top().nCharsToSkip--;
+}
}
// read a single char if we're in hex mode
if (m_aStates.top().nInternalState == INTERNAL_HEX)
@@ -758,7 +762,8 @@ int RTFDocumentImpl::resolveChars(char ch)
if (m_aStates.top().nInternalState == INTERNAL_HEX)
{
-m_aHexBuffer.append(ch);
+if (!bSkipped)
+m_aHexBuffer.append(ch);
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/xml/xmltexte.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8a8eb870b8037801f81c680441d10a1ef95bfb06
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 22 16:05:47 2012 +
fdo#33393 - tentative workaround for autosave image loss
cf. lengthy analysis in the bug, this appears to merit wider testing
for 3.5.1 RC1 and wouldn't be sensible without that, so commit early.
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/xml/xmltexte.cxx
b/sw/source/filter/xml/xmltexte.cxx
index c49ec0d..1610a71 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -227,7 +227,9 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
{
String aNewURL( RTL_CONSTASCII_USTRINGPARAM(vnd.sun.star.Package:) );
aNewURL += String(rURL);
-pGrfNd-SetNewStreamName( aNewURL );
+
+// This is nonsensical.
+//pGrfNd-SetNewStreamName( aNewURL );
// #i15411# save-as will swap all graphics in; we need to swap
// them out again, to prevent excessive memory use
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/data/fdo42465.rtf |4 ++
sw/qa/extras/rtftok/rtftok.cxx| 47 ++
2 files changed, 35 insertions(+), 16 deletions(-)
New commits:
commit 938ddf379004d9696a005ed612994576e2d7cca0
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 17:53:03 2012 +0100
testcase for fdo#42465
diff --git a/sw/qa/extras/rtftok/data/fdo42465.rtf
b/sw/qa/extras/rtftok/data/fdo42465.rtf
new file mode 100644
index 000..06c29d4
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo42465.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+{\langfe1038\dbch\af14\afs24\alang1025\rtlch \ltrch\loch\fs24\lang1038\loch\f7
+k\uc2 \u243\'c3\'b3d\uc1 }
+\par }
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index eb64e0a..92c3229 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -58,6 +58,7 @@ public:
void testN192129();
void testFdo45543();
void testN695479();
+void testFdo42465();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -65,11 +66,15 @@ public:
CPPUNIT_TEST(testN192129);
CPPUNIT_TEST(testFdo45543);
CPPUNIT_TEST(testN695479);
+CPPUNIT_TEST(testFdo42465);
#endif
CPPUNIT_TEST_SUITE_END();
private:
+/// Load an RTF file and make the document available via mxComponent.
void load(const OUString rURL);
+/// Get the length of the whole document.
+int getLength();
uno::Referencelang::XComponent mxComponent;
};
@@ -78,6 +83,25 @@ void RtfModelTest::load(const OUString rFilename)
mxComponent = loadFromDesktop(getURLFromSrc(/sw/qa/extras/rtftok/data/)
+ rFilename);
}
+int RtfModelTest::getLength()
+{
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum =
xParaEnumAccess-createEnumeration();
+OUStringBuffer aBuf;
+while (xParaEnum-hasMoreElements())
+{
+uno::Referencecontainer::XEnumerationAccess
xRangeEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRangeEnum =
xRangeEnumAccess-createEnumeration();
+while (xRangeEnum-hasMoreElements())
+{
+uno::Referencetext::XTextRange xRange(xRangeEnum-nextElement(),
uno::UNO_QUERY);
+aBuf.append(xRange-getString());
+}
+}
+return aBuf.getLength();
+}
+
void RtfModelTest::setUp()
{
test::BootstrapFixture::setUp();
@@ -150,22 +174,7 @@ void RtfModelTest::testN192129()
void RtfModelTest::testFdo45543()
{
load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo45543.rtf)));
-
-uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
-uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
-uno::Referencecontainer::XEnumeration xParaEnum =
xParaEnumAccess-createEnumeration();
-OUStringBuffer aBuf;
-while (xParaEnum-hasMoreElements())
-{
-uno::Referencecontainer::XEnumerationAccess
xRangeEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
-uno::Referencecontainer::XEnumeration xRangeEnum =
xRangeEnumAccess-createEnumeration();
-while (xRangeEnum-hasMoreElements())
-{
-uno::Referencetext::XTextRange xRange(xRangeEnum-nextElement(),
uno::UNO_QUERY);
-aBuf.append(xRange-getString());
-}
-}
-CPPUNIT_ASSERT_EQUAL((sal_Int32)5, aBuf.getLength());
+CPPUNIT_ASSERT_EQUAL(5, getLength());
}
void RtfModelTest::testN695479()
@@ -229,6 +238,12 @@ void RtfModelTest::testN695479()
CPPUNIT_ASSERT(bDrawFound);
}
+void RtfModelTest::testFdo42465()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo42465.rtf)));
+CPPUNIT_ASSERT_EQUAL(3, getLength());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/XMLExportDatabaseRanges.cxx |2
sc/source/ui/docshell/dbdocfun.cxx |4 -
sc/source/ui/docshell/docsh5.cxx |2
sc/source/ui/namedlg/namemgrtable.cxx|2
sc/source/ui/undo/undoutil.cxx |2
sc/source/ui/unoobj/chart2uno.cxx|6 +-
sc/source/ui/vba/vbaapplication.cxx | 54 +++
7 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit dcd7dc43376c914027b76525959a9cea71d9279e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Feb 23 03:20:53 2012 +0900
avoid temporary rtl::OUString
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index a552ee9..8aab8b5 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -111,7 +111,7 @@ ScMyEmptyDatabaseRangesContainer
ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
sal_Int32 nLength = aImportProperties.getLength();
sheet::DataImportMode nSourceType =
sheet::DataImportMode_NONE;
for (sal_Int32 j = 0; j nLength; ++j)
-if (aImportProperties[j].Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SRCTYPE)))
+if
(aImportProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_SRCTYPE)))
aImportProperties[j].Value = nSourceType;
if (nSourceType != sheet::DataImportMode_NONE)
{
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 0461d2b..3266abe 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -89,7 +89,7 @@ bool ScDBDocFunc::AddDBRange( const ::rtl::OUString rName,
const ScRange rRang
bool bOk;
if ( bCompile )
pDoc-CompileDBFormula( sal_True ); // CreateFormulaString
-if
(rtl::OUString(rName)==rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)))
+if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
{
pDoc-SetAnonymousDBData(rRange.aStart.Tab() , pNew);
bOk = true;
@@ -209,7 +209,7 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData rNewData )
bool bUndo = pDoc-IsUndoEnabled();
ScDBData* pData = NULL;
-if
(rtl::OUString(rNewData.GetName())==rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)))
+if
(rNewData.GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
{
ScRange aRange;
rNewData.GetArea(aRange);
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index b965d50..bbb1e7e 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -165,7 +165,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange rMarked,
ScGetDBMode eMode, ScGe
SCCOL nOldCol2;
SCROW nOldRow2;
pData-GetArea( nDummy, nOldCol1,nOldRow1, nOldCol2,nOldRow2 );
-sal_Bool bIsNoName = ( rtl::OUString(pData-GetName()) ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)) );
+sal_Bool bIsNoName = (
pData-GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME))
);
if (!bSelected)
{
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index 2bc5189..b94d8ae 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -133,7 +133,7 @@ void ScRangeManagerTable::Init()
{
const ScRangeName* pLocalRangeName = itr-second;
ScRangeNameLine aLine;
-if (itr-first ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))
+if
(itr-first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_GLOBAL_RANGE_NAME)))
aLine.aScope = maGlobalString;
else
aLine.aScope = itr-first;
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index bf4ac68..91f 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -97,7 +97,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData,
ScDocument* pDoc, SCTAB
if ( pUndoData )
{
const ::rtl::OUString aName = pUndoData-GetName();
-if (aName ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)))
+if
(aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
bWasTemp = true;
}
OSL_ENSURE(bWasTemp, Undo: didn't find database range);
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 7e42f8d..90d1b07 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f8506ca12e5cd35126ea419c7b7bb26d0920c4b4 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 22 19:50:32 2012 +0100 Adapt to new rtl::OUString ctor diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx index 938212d..0fb4b7c 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx @@ -621,8 +621,8 @@ namespace SfxContainer_Impl /*N*/ INetURLObject aUserBasic60InetObj_1( aUserBasicInetObj ); /*N*/ aUserBasic60InetObj_1.removeSegment(); /*N*/ INetURLObject aUserBasic60InetObj_2 = aUserBasic60InetObj_1; -/*N*/ aUserBasic60InetObj_1.Append( str60FolderName_1 ); -/*N*/ aUserBasic60InetObj_2.Append( str60FolderName_2 ); +/*N*/ aUserBasic60InetObj_1.Append(rtl::OString(str60FolderName_1)); +/*N*/ aUserBasic60InetObj_2.Append(rtl::OString(str60FolderName_2)); /*N*/ /*N*/ INetURLObject aUserBasic60InetObj = aUserBasic60InetObj_1; /*N*/ String aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-1'
New branch 'libreoffice-3-5-1' available with the following commits: commit c8db621584c247a1f27a8427a2e913de46066963 Author: Petr Mladek pmla...@suse.cz Date: Wed Feb 22 20:51:29 2012 +0100 Branch libreoffice-3-5-1 This is 'libreoffice-3-5-1' - the stable branch for the 3.5.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-1'
New branch 'libreoffice-3-5-1' available with the following commits: commit 166807adec955f93a638191705c28b19d4fd2fac Author: Petr Mladek pmla...@suse.cz Date: Wed Feb 22 20:51:33 2012 +0100 Branch libreoffice-3-5-1 This is 'libreoffice-3-5-1' - the stable branch for the 3.5.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/scriptitems.pm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9eb6527dae59c661942a7cd91c4d4b317cd33ef0 Author: Tim Retout t...@retout.co.uk Date: Wed Feb 22 19:41:22 2012 + Re-enable errors for help pack files with no source. diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 3252058..f91e019 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1379,7 +1379,7 @@ sub remove_Files_Without_Sourcedirectory push( @installer::globals::logfileinfo, $infoline); push(@missingfiles, ERROR: File not found: $filename\n); -$error_occured = 1; +$error_occurred = 1; next; # removing this file from list, if sourcepath is empty } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/dpobject.cxx | 105 ++-
sc/source/ui/view/dbfunc3.cxx| 10 +--
2 files changed, 55 insertions(+), 60 deletions(-)
New commits:
commit 251c24fed0fd34cec7e699a8af608748e5b9b4bf
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Feb 22 15:41:27 2012 -0500
Scope reduction.
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 8f85bcf..4d3ff60 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2377,64 +2377,61 @@ uno::Referencesheet::XDimensionsSupplier
ScDPObject::CreateSource( const ScDPS
uno::Referencesheet::XDimensionsSupplier xRet = NULL;
uno::Referencelang::XMultiServiceFactory xManager =
comphelper::getProcessServiceFactory();
-uno::Referencecontainer::XContentEnumerationAccess xEnAc( xManager,
uno::UNO_QUERY );
-if ( xEnAc.is() )
+uno::Referencecontainer::XContentEnumerationAccess xEnAc(xManager,
uno::UNO_QUERY);
+if (!xEnAc.is())
+return xRet;
+
+uno::Referencecontainer::XEnumeration xEnum =
+
xEnAc-createContentEnumeration(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCDPSOURCE_SERVICE)));
+if (!xEnum.is())
+return xRet;
+
+while (xEnum-hasMoreElements() !xRet.is())
{
-uno::Referencecontainer::XEnumeration xEnum =
xEnAc-createContentEnumeration(
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
-if ( xEnum.is() )
+uno::Any aAddInAny = xEnum-nextElement();
+uno::Referenceuno::XInterface xIntFac;
+aAddInAny = xIntFac;
+if (!xIntFac.is())
+continue;
+
+uno::Referencelang::XServiceInfo xInfo(xIntFac, uno::UNO_QUERY);
+if (!xInfo.is() || xInfo-getImplementationName() != aImplName)
+continue;
+
+try
{
-while ( xEnum-hasMoreElements() !xRet.is() )
+// #i113160# try XSingleComponentFactory in addition to (old)
XSingleServiceFactory,
+// passing the context to the component (see
ScUnoAddInCollection::Initialize)
+
+uno::Referenceuno::XInterface xInterface;
+uno::Referenceuno::XComponentContext xCtx = getContext(xManager);
+uno::Referencelang::XSingleComponentFactory xCFac( xIntFac,
uno::UNO_QUERY );
+if (xCtx.is() xCFac.is())
+xInterface = xCFac-createInstanceWithContext(xCtx);
+
+if (!xInterface.is())
{
-uno::Any aAddInAny = xEnum-nextElement();
-// if ( aAddInAny.getReflection()-getTypeClass() ==
TypeClass_INTERFACE )
-{
-uno::Referenceuno::XInterface xIntFac;
-aAddInAny = xIntFac;
-if ( xIntFac.is() )
-{
-uno::Referencelang::XServiceInfo xInfo( xIntFac,
uno::UNO_QUERY );
-if ( xInfo.is() xInfo-getImplementationName() ==
aImplName )
-{
-try
-{
-// #i113160# try XSingleComponentFactory in
addition to (old) XSingleServiceFactory,
-// passing the context to the component (see
ScUnoAddInCollection::Initialize)
-
-uno::Referenceuno::XInterface xInterface;
-uno::Referenceuno::XComponentContext xCtx =
getContext(xManager);
-uno::Referencelang::XSingleComponentFactory
xCFac( xIntFac, uno::UNO_QUERY );
-if (xCtx.is() xCFac.is())
-xInterface =
xCFac-createInstanceWithContext(xCtx);
-
-if (!xInterface.is())
-{
-
uno::Referencelang::XSingleServiceFactory xFac( xIntFac, uno::UNO_QUERY );
-if ( xFac.is() )
-xInterface = xFac-createInstance();
-}
-
-uno::Referencelang::XInitialization xInit(
xInterface, uno::UNO_QUERY );
-if (xInit.is())
-{
-// initialize
-uno::Sequenceuno::Any aSeq(4);
-uno::Any* pArray = aSeq.getArray();
-pArray[0] = rtl::OUString(
rDesc.aParSource );
-pArray[1] = rtl::OUString(
rDesc.aParName );
-pArray[2] = rtl::OUString(
rDesc.aParUser );
-pArray[3] = rtl::OUString(
rDesc.aParPass );
-xInit-initialize( aSeq );
-
[Libreoffice-commits] .: 2 commits - libxml2/makefile.mk libxml2/prj libxslt/prj sc/source
libxml2/makefile.mk |2 +-
libxml2/prj/d.lst|2 ++
libxslt/prj/d.lst|5 +
sc/source/core/data/dpobject.cxx |2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 23dace36e79aba275592d611298abe524d4adbbf
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Feb 22 15:58:53 2012 -0600
WaE unitialized variable
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4d3ff60..5d4e8bc 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1795,7 +1795,7 @@ void lcl_FillOldFields(
{
uno::Any aOrigAny = xDimProp-getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
-sal_Int32 nTmp;
+sal_Int32 nTmp = 0;
if (aOrigAny = nTmp)
nDupSource = static_castsal_Int32(nTmp);
}
commit 49843f0f9788e01805d8d0d27428fe5e6a4cc530
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Feb 22 15:58:19 2012 -0600
support using for libxml2 internal on MacOSX
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 78c4c3e..b9f6db4 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -146,7 +146,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)
OUTDIR2INC=include$/libxml
.IF $(OS)==MACOSX
-EXTRPATH=URELIB
+EXTRPATH=LOADER
OUT2LIB+=.libs$/libxml2.*.dylib
OUT2BIN+=.libs$/xmllint
OUT2BIN+=xml2-config
diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst
index 6e7bbb4..d5e98d4 100644
--- a/libxml2/prj/d.lst
+++ b/libxml2/prj/d.lst
@@ -2,6 +2,8 @@ mkdir: %_DEST%\inc\external\libxml
..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h
..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
+..\%__SRC%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.2.dylib
+symlink: %_DEST%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.dylib
..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so
..\%__SRC%\lib\*.lib %_DEST%\lib
..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst
index 0627cc1..f3613b0 100644
--- a/libxslt/prj/d.lst
+++ b/libxslt/prj/d.lst
@@ -1,10 +1,15 @@
mkdir: %_DEST%\inc\external\libxslt
..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h
+..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib
+symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib
+...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1
symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so
..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so
..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0
symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so
+..\%__SRC%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.0.dylib
+symlink: %_DEST%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.dylib
..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.*
..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 617c91401651d96f4ad48b529efd8d2390ae7a4b
Author: Tim Retout t...@retout.co.uk
Date: Wed Feb 22 22:41:03 2012 +
Remove unnecessary $run variable from installer.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 685881a..e2a94d4 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1269,18 +1269,14 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::linuxlinkrpms =~
/\b$onepackagename\b/ )
{
-my $run = 0;
-
-if (( $installer::globals::makelinuxlinkrpm ) ( ! $run
))
+if ( $installer::globals::makelinuxlinkrpm )
{
$filesinpackage =
\@installer::globals::linuxpatchfiles;
$linksinpackage = \@installer::globals::linuxlinks;
$installer::globals::makelinuxlinkrpm = 0;
if ( $installer::globals::patch ) {
$installer::globals::call_epm = 1; } # enabling packing again
-$run = 1;
}
-
-if (( ! $installer::globals::makelinuxlinkrpm ) ( !
$run ))
+else
{
$filesinpackage =
installer::worker::prepare_linuxlinkfiles($filesinpackage);
$linksinpackage =
installer::worker::prepare_forced_linuxlinkfiles($linksinpackage);
@@ -1288,7 +1284,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
$installer::globals::add_required_package =
$packagename . u;
if ( $installer::globals::patch ) {
$installer::globals::call_epm = 0; } # no packing of core module in patch
$shellscriptsfilename = ; # shell scripts only need
to be included into the link rpm
-$run = 1;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/source vcl/source
sw/source/core/doc/doclay.cxx |3 +++
sw/source/core/docnode/ndcopy.cxx |2 +-
sw/source/core/unocore/unotext.cxx|6 --
vcl/source/glyphs/graphite_layout.cxx |2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 91fab30f3b1617024ee2eadf3c7ad1ea84d7f6dd
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:58:04 2012 +0100
fdo#46482: prevent duplication of frames:
SwDoc::MakeFlySection: abuse the SwDoc::mbRedlineMove flag, which
(with the fix for fdo#40599) does exactly what is necessary to prevent
the spurious copies.
Also, remove the ugly hack to work around this problem from
SwXText::convertToTextFrame.
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 17264ca..c184135 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -840,8 +840,10 @@ if( GetIDocumentUndoRedo().DoesUndo() )
SwPaM* pTmp = (SwPaM*)rPam;
sal_Bool bOldFlag = mbCopyIsMove;
bool const bOldUndo = GetIDocumentUndoRedo().DoesUndo();
+bool const bOldRedlineMove(IsRedlineMove());
mbCopyIsMove = sal_True;
GetIDocumentUndoRedo().DoUndo(false);
+SetRedlineMove(true);
do {
if( pTmp-HasMark()
*pTmp-GetPoint() != *pTmp-GetMark() )
@@ -850,6 +852,7 @@ if( GetIDocumentUndoRedo().DoesUndo() )
}
pTmp = static_castSwPaM*(pTmp-GetNext());
} while ( rPam != pTmp );
+SetRedlineMove(bOldRedlineMove);
mbCopyIsMove = bOldFlag;
GetIDocumentUndoRedo().DoUndo(bOldUndo);
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 2c25700..c83d243 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1720,12 +1720,6 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
SwFmtAnchor aAnchor((*i)-GetAnchor());
aAnchor.SetAnchor(aMovePam.Start());
m_pImpl-m_pDoc-SetAttr(aAnchor, *(*i));
-
-// delete the old anchor
-SwSpzFrmFmts* pFrmFmts =
m_pImpl-m_pDoc-GetSpzFrmFmts();
-// here we rely on that fact that this is a sorted
list, where the last element is the newly created frame
-SwFrmFmt *pFrmFmt = (*pFrmFmts)[pFrmFmts-Count()-1];
-m_pImpl-m_pDoc-DelLayoutFmt(pFrmFmt);
}
}
}
commit 23e52c207760c596cc2f841ef59f3100c110d591
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:48:57 2012 +0100
fdo#40599 i#112763: fix frame duplication:
SwDoc::CopyFlyInFlyImpl: When called from SwRedline::CopyToSection, do not
copy frames that are anchored at the redline end node by checking
IsRedlineMove(); these frames are not deleted by DelCopyOfSection and were
thus duplicated on every Show/Hide redlines.
(regression from 62ebbb006b4a11974e14dd61d3c453a98336f951 (CWS os131))
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 07bf4a4..2461505 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1431,7 +1431,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
bool bAdd = false;
if( pAPos-nNode rRg.aEnd )
bAdd = true;
-if( !bAdd )
+if (!bAdd !IsRedlineMove()) // fdo#40599: not for redline move
{
bool bEmptyNode = false;
bool bLastNode = false;
commit d066f7e4afb3c9e395932ba7bf8715ad0770bcdd
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:48:52 2012 +0100
vcl: crash in GraphiteLayout::expandOrCondense:
When printing the bugdoc from i#103958:
error: attempt to subscript container with out-of-bounds index 5, but
container only holds 5 elements.
#4 0x7fd37902be5e in GraphiteLayout::expandOrCondense (this=0x35296a8,
rArgs=...) at vcl/source/glyphs/graphite_layout.cxx:848
#5 0x7fd37902bc54 in GraphiteLayout::AdjustLayout (this=0x35296a8,
rArgs=...) at vcl/source/glyphs/graphite_layout.cxx:812
#6 0x7fd3790345c8 in GraphiteServerFontLayout::AdjustLayout
(this=0x3529640, rArgs=...) at vcl/inc/graphite_serverfont.hxx:76
#7 0x7fd378d5c91d in OutputDevice::forceFallbackFontToFit
(this=0x35022c0, rFallback=..., rFallbackFont=..., rFontSelData=...,
nFallbackLevel=1, rLayoutArgs=..., rOrigMetric=...) at
vcl/source/gdi/outdev3.cxx:6094
#8 0x7fd378d5cece in OutputDevice::ImplGlyphFallbackLayout
(this=0x35022c0, pSalLayout=0x36136c0, rLayoutArgs=...) at
vcl/source/gdi/outdev3.cxx:6206
#9
[Libreoffice-commits] .: sc/source
sc/source/filter/html/htmlexp2.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit e9d045f0f476c80060a350c08d8b253eaf41c41f
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Thu Feb 23 13:00:15 2012 +1030
Translation of German comments in sc html filter (htmlexp2.cxx)
diff --git a/sc/source/filter/html/htmlexp2.cxx
b/sc/source/filter/html/htmlexp2.cxx
index 4834b4a..15091d1 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -71,7 +71,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer,
SCTAB nTab,
{
ScHTMLGraphEntry* pE = aGraphList[ i ];
if ( !pE-bInCell )
-{ // nicht alle in Zellen: einige neben Tabelle
+{ // not all cells: table next to some
bTabAlignedLeft = sal_True;
break;
}
@@ -198,17 +198,19 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
void ScHTMLExport::WriteImage( String rLinkName, const Graphic rGrf,
const rtl::OString rImgOptions, sal_uLong nXOutFlags )
{
-// embeddete Grafik - via WriteGraphic schreiben
+// Embedded graphic - create an image file
if( !rLinkName.Len() )
{
if( aStreamPath.Len() 0 )
{
-// Grafik als (JPG-)File speichern
+// Save as a PNG
String aGrfNm( aStreamPath );
nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
CREATE_STRING( PNG ), nXOutFlags );
-if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben
+
+// If it worked, create a URL for the IMG tag
+if( !nErr )
{
rLinkName = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL),
@@ -221,6 +223,7 @@ void ScHTMLExport::WriteImage( String rLinkName, const
Graphic rGrf,
}
else
{
+// Linked graphic - figure out the URL for the IMG tag
if( bCopyLocalFileToINet || HasCId() )
{
CopyLocalFileToINet( rLinkName, aStreamPath );
@@ -233,8 +236,11 @@ void ScHTMLExport::WriteImage( String rLinkName, const
Graphic rGrf,
rLinkName,
URIHelper::GetMaybeFileHdl());
}
+
+// If a URL was set, output the IMG tag.
+// IMG SRC=...[ rImgOptions]
if( rLinkName.Len() )
-{ // IMG SRC=...[ rImgOptions]
+{
rStrm '' OOO_STRING_SVTOOLS_HTML_image ' '
OOO_STRING_SVTOOLS_HTML_O_src =\;
HTMLOutFuncs::Out_String( rStrm,
URIHelper::simpleNormalizedMakeRelative(
aBaseURL,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
