[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/namedlg/namedlg.cxx | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit 393bd0eebe09230ef90c5b343c93338526f3f4b7
Author: Noel Power noel.po...@novell.com
Date: Fri Feb 24 12:27:37 2012 +
fix core when clicking on entries in Manage Names dialog in calc fdo#46568
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 56c50e8..06ad128 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -269,10 +269,28 @@ void ScNameDlg::SetActive()
void ScNameDlg::UpdateChecks(ScRangeData* pData)
{
+// remove handlers, we only want the handlers to process
+// user input and not when we are syncing the controls with our internal
+// model ( also UpdateChecks is called already from some other event
+// handlers, triggering handlers while already processing a handler can
+// ( and does in this case ) corrupt the internal data
+
+maBtnCriteria.SetToggleHdl( Link() );
+maBtnPrintArea.SetToggleHdl( Link() );
+maBtnColHeader.SetToggleHdl( Link() );
+maBtnRowHeader.SetToggleHdl( Link() );
+
maBtnCriteria .Check( pData-HasType( RT_CRITERIA ) );
maBtnPrintArea.Check( pData-HasType( RT_PRINTAREA ) );
maBtnColHeader.Check( pData-HasType( RT_COLHEADER ) );
maBtnRowHeader.Check( pData-HasType( RT_ROWHEADER ) );
+
+// Restore handlers so user input is processed again
+Link aToggleHandler = LINK( this, ScNameDlg, EdModifyHdl );
+maBtnCriteria.SetToggleHdl( aToggleHandler );
+maBtnPrintArea.SetToggleHdl( aToggleHandler );
+maBtnColHeader.SetToggleHdl( aToggleHandler );
+maBtnRowHeader.SetToggleHdl( aToggleHandler );
}
bool ScNameDlg::IsNameValid()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/inc
basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 0499a44cddae31dff5ce1959aba8aa64119dea90 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Feb 26 16:29:47 2012 +0400 definition was removed, remove declaration as well diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx index 03fd079..d125d47 100644 --- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx +++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx @@ -62,9 +62,6 @@ namespace basegfx // version for Polygons BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke); -// versions for B2DRange, clips only against X,Y -BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon rCandidate, const B2DRange rRange, bool bInside, bool bStroke); - } // end of namespace tools } // end of namespace basegfx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/unoidl/sddetect.cxx | 22 +++---
sd/source/ui/unoidl/unomodel.cxx |4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit c471556c89e4efcd21c0e48f938792c493662492
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Feb 27 01:45:47 2012 +0900
Avoid temporary rtl::OUString in sd
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index dba3e46..87b113d 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -128,42 +128,42 @@ SdFilterDetect::~SdFilterDetect()
for( sal_Int32 nProperty=0; nPropertynPropertyCount; ++nProperty )
{
// extract properties
-if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(URL)) )
+if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL)) )
{
lDescriptor[nProperty].Value = sTemp;
aURL = sTemp;
}
-else if( !aURL.Len() lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(FileName)) )
+else if( !aURL.Len()
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(FileName))
)
{
lDescriptor[nProperty].Value = sTemp;
aURL = sTemp;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(TypeName)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(TypeName))
)
{
lDescriptor[nProperty].Value = sTemp;
aTypeName = sTemp;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(FilterName)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(FilterName))
)
{
lDescriptor[nProperty].Value = sTemp;
aPreselectedFilterName = sTemp;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(InputStream)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(InputStream))
)
nIndexOfInputStream = nProperty;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(ReadOnly)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ReadOnly))
)
nIndexOfReadOnlyFlag = nProperty;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(UCBContent)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UCBContent))
)
nIndexOfContent = nProperty;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(AsTemplate)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AsTemplate))
)
{
lDescriptor[nProperty].Value = bOpenAsTemplate;
nIndexOfTemplateFlag = nProperty;
}
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(InteractionHandler)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(InteractionHandler))
)
lDescriptor[nProperty].Value = xInteraction;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(RepairPackage)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(RepairPackage))
)
lDescriptor[nProperty].Value = bRepairPackage;
-else if( lDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(DocumentTitle)) )
+else if(
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(DocumentTitle))
)
nIndexOfDocumentTitle = nProperty;
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index a061d4f..9bb08b3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1804,9 +1804,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32
nRenderer, const uno::Any r
for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength();
nProperty nPropertyCount; ++nProperty )
{
-if( rxOptions[ nProperty ].Name == OUString(
RTL_CONSTASCII_USTRINGPARAM( RenderDevice ) ) )
+if( rxOptions[ nProperty
].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(RenderDevice)) )
rxOptions[ nProperty ].Value = xRenderDevice;
-else if ( rxOptions[ nProperty ].Name == OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportNotesPages ) ) )
+else if ( rxOptions[ nProperty
].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ExportNotesPages)) )
{
rxOptions[ nProperty].Value = bExportNotesPages;
if ( bExportNotesPages )
___
Libreoffice-commits mailing list
[Libreoffice-commits] .: 2 commits - install-sh Makefile Makefile.post post.Makefile
Makefile |4
Makefile.post |7
install-sh| 707 +++---
post.Makefile |7
4 files changed, 488 insertions(+), 237 deletions(-)
New commits:
commit b4a66196b161d7c7a5c813a12ecb9ece33d23abc
Author: Peter Foley pefol...@verizon.net
Date: Sun Feb 26 13:39:19 2012 -0500
update install-sh to the automake-1.11 version
diff --git a/install-sh b/install-sh
index 36f96f3..a9244eb 100644
--- a/install-sh
+++ b/install-sh
@@ -1,276 +1,527 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2011-01-19.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the Software), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
#
-# Copyright 1991 by the Massachusetts Institute of Technology
#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided as is
-# without express or implied warranty.
+# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+nl='
+'
+IFS=$nl
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog=${MVPROG-mv}
-cpprog=${CPPROG-cp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-chgrpprog=${CHGRPPROG-chgrp}
-stripprog=${STRIPPROG-strip}
-rmprog=${RMPROG-rm}
-mkdirprog=${MKDIRPROG-mkdir}
-
-transformbasename=
-transform_arg=
-instcmd=$mvprog
-chmodcmd=$chmodprog 0755
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd=$rmprog -f
-mvcmd=$mvprog
-src=
-dst=
-dir_arg=
-
-while [ x$1 != x ]; do
-case $1 in
- -c) instcmd=$cpprog
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd=$chmodprog $2
- shift
- shift
- continue;;
-
- -o) chowncmd=$chownprog $2
- shift
- shift
- continue;;
-
- -g) chgrpcmd=$chgrpprog $2
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x$src = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
-esac
-done
-
-if [ x$src = x ]
-then
-
[Libreoffice-commits] .: Makefile
Makefile |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit a75873dea15719b5216cfd0476d30003ffc76e80 Author: Peter Foley pefol...@verizon.net Date: Sun Feb 26 13:53:09 2012 -0500 allow autogen.sh to be run automatically diff --git a/Makefile b/Makefile index a37bca3..68bea91 100644 --- a/Makefile +++ b/Makefile @@ -342,12 +342,15 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),) # restart since autogen can have changed # config_host.k which is included in this # Makefile -Makefile: config_host.mk +Makefile: $(SRCDIR)/config_host.mk touch $@ -config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun +$(SRCDIR)/config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun ./autogen.sh +autogen.lastrun: + @true + # # Fetch # ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
