config_host.mk.in | 1 +
configure.ac | 20 ++++++++++++++++++++
g | 16 +++++++++++++++-
sw/source/core/doc/notxtfrm.cxx | 3 +--
4 files changed, 37 insertions(+), 3 deletions(-)
New commits:
commit a9ff36b533bc822a82253b888e488b2391da7a8d
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 23 22:27:57 2013 +0200
fdo#60280: sw: restore anti-aliasing for all OLE objects
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the
anti-aliasing always but reset it only for Charts.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e
(cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c)
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189..a839420 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1143,8 +1143,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect &rGrfArea ) cons
}
// see #i99665#
- if ( pOLENd->IsChart() &&
- pShell->Imp()->GetDrawView()->IsAntiAliasing() )
+ if (pShell->Imp()->GetDrawView()->IsAntiAliasing())
{
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
}
commit 071b9690f7b0b1eb774d92a07c77f45db12f647d
Author: Miklos Vajna <vmik...@suse.cz>
Date: Sat Feb 9 19:09:32 2013 +0100
configure: add --with-referenced-git option
This is similar to --with-linked-git, but:
1) It uses git submodule update --reference, so it works with submodules.
2) The created repo is a true git repo, except that its object database
reuses the referenced repo's objects, so it's a real speedup when e.g.
translations are enabled.
I intentionally didn't just fixed --with-linked-git, to make it clear
this is more like git clone --reference, not git-new-workdir.
Change-Id: I7c9584bce3670fd1e175b90aded2435cfe78056d
(cherry picked from commit 803137f4715ee7ab127a9718ca213db252193398)
Conflicts:
configure.ac
diff --git a/config_host.mk.in b/config_host.mk.in
index 17ab6a6..668d6d7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -183,6 +183,7 @@ export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
+export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export PARALLELISM?=@PARALLELISM@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index c561981..f23be2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1153,6 +1153,14 @@ AC_ARG_WITH(linked-git,
GIT_LINK_SRC=$withval ,
)
+AC_ARG_WITH(referenced-git,
+ AS_HELP_STRING([--with-referenced-git=<OTHER_CHECKOUT_DIR>],
+ [Specify another checkout directory to reference. This makes use of
+ git submodule update --reference, and saves a lot of diskspace
+ when having multiple trees side-by-side.]),
+ GIT_REFERENCE_SRC=$withval ,
+)
+
AC_ARG_WITH(vba-package-format,
AS_HELP_STRING([--with-vba-package-format],
[Specify package format for vba compatibility api. Specifying
"builtin"
@@ -11668,6 +11676,18 @@ else
fi
AC_SUBST(PROGRESSTEXTBASELINE)
+dnl git submodule update --reference
+dnl ===================================================================
+if test -n "${GIT_REFERENCE_SRC}"; then
+ for repo in ${GIT_NEEDED_SUBMODULES}; do
+ if ! test -d "${GIT_REFERENCE_SRC}"/${repo}; then
+ AC_MSG_ERROR([referenced git: required repository does not exist:
${GIT_REFERENCE_SRC}/${repo}])
+ fi
+ done
+fi
+AC_SUBST(GIT_REFERENCE_SRC)
+
+
AC_MSG_CHECKING([for alternative branding images directory])
INTRO_BITMAP=
ABOUT_BACKGROUND_SVG=
diff --git a/g b/g
index 288489c..c99519b 100755
--- a/g
+++ b/g
@@ -122,6 +122,14 @@ get_configured_submodules()
fi
}
+get_git_reference()
+{
+ REFERENCED_GIT=""
+ if [ -f config_host.mk ]; then
+ REFERENCED_GIT=$(cat config_host.mk | grep GIT_REFERENCE_SRC | sed -e
"s/.*=//")
+ fi
+}
+
do_shortcut_update()
{
local module
@@ -222,6 +230,11 @@ local configured
git submodule init $module || return $?
fi
done
+ if [ -n "$REFERENCED_GIT" ] ; then
+ for module in $SUBMODULES_CONFIGURED ; do
+ git submodule update --reference
$REFERENCED_GIT/.git/modules/$module $module || return $?
+ done
+ fi
return 0
}
@@ -239,6 +252,7 @@ fi
get_active_submodules
get_configured_submodules
+get_git_reference
@@ -295,7 +309,7 @@ case "$COMMAND" in
do_checkout "$@"
;;
clone)
- do_init_modules && git submodule update && refresh_all_hooks
+ do_init_modules && refresh_all_hooks
;;
fetch)
(git fetch "$@" && git submodule foreach git fetch "$@" ) && git
submodule update
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
