[Libreoffice-commits] .: offapi/com
offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ebdc3ad1ee835212be4eb5fe99d5442c8baff920
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Nov 29 09:40:48 2011 +0100
Fix build in offapi.
diff --git a/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
b/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
index 786dba3..fe49579 100644
--- a/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
@@ -28,6 +28,8 @@
#ifndef __com_sun_star_sheet_XSelectedSheetsSupplier_idl__
#define __com_sun_star_sheet_XSelectedSheetsSupplier_idl__
+#include com/sun/star/uno/XInterface.idl
+
module com { module sun { module star { module sheet {
interface XSelectedSheetsSupplier: com::sun::star::uno::XInterface
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: default_images/brand
default_images/brand/about.png |binary default_images/brand/intro.png |binary default_images/brand/shell/backing_left.png |binary default_images/brand/shell/backing_rtl_left.png |binary 4 files changed New commits: commit 337eda19a516646752f195d7c2a35cc1af2e9410 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Nov 29 10:29:41 2011 +0100 Switch artwork to LibreOffice-only branding. diff --git a/default_images/brand/about.png b/default_images/brand/about.png index 3520c50..b9e7626 100644 Binary files a/default_images/brand/about.png and b/default_images/brand/about.png differ diff --git a/default_images/brand/intro.png b/default_images/brand/intro.png index a775627..f1bc4d2 100644 Binary files a/default_images/brand/intro.png and b/default_images/brand/intro.png differ diff --git a/default_images/brand/shell/backing_left.png b/default_images/brand/shell/backing_left.png index 4b830ba..a4d5ba2 100644 Binary files a/default_images/brand/shell/backing_left.png and b/default_images/brand/shell/backing_left.png differ diff --git a/default_images/brand/shell/backing_rtl_left.png b/default_images/brand/shell/backing_rtl_left.png index 4b830ba..a4d5ba2 100644 Binary files a/default_images/brand/shell/backing_rtl_left.png and b/default_images/brand/shell/backing_rtl_left.png differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/source sw/qa
sc/source/ui/inc/namemgrtable.hxx | 13 +++-
sc/source/ui/namedlg/namemgrtable.cxx | 54 ++
sc/source/ui/src/namedefdlg.src |2 -
sw/qa/core/macros-test.cxx| 34 +++--
4 files changed, 67 insertions(+), 36 deletions(-)
New commits:
commit 792fb5b96f1008804ab51dc0ebf4f07a07ad9537
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Nov 29 10:39:01 2011 +0100
ManageNames: only calculate formula for visible range names
diff --git a/sc/source/ui/inc/namemgrtable.hxx
b/sc/source/ui/inc/namemgrtable.hxx
index b95002e..bbbcab6 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -36,6 +36,7 @@
#include boost/ptr_container/ptr_map.hpp
class ScRangeName;
+class ScRangeData;
struct ScRangeNameLine
{
@@ -64,8 +65,17 @@ private:
HeaderBar maHeaderBar;
rtl::OUString maGlobalString;
+// should be const because we should not modify it here
+const boost::ptr_maprtl::OUString, ScRangeName mrRangeMap;
+// for performance, save which entries already have the formula entry
+// otherwise opening the dialog with a lot of range names is extremelly
slow because
+// we would calculate all formula strings during opening
+std::mapSvLBoxEntry*, bool maCalculatedFormulaEntries;
+
void GetLine(ScRangeNameLine aLine, SvLBoxEntry* pEntry);
-void Init( const boost::ptr_maprtl::OUString, ScRangeName rRangeMap );
+void Init();
+void CheckForFormulaString();
+const ScRangeData* findRangeData(const ScRangeNameLine rLine);
public:
ScRangeManagerTable( Window* pParent, boost::ptr_maprtl::OUString,
ScRangeName aTabRangeNames );
@@ -78,6 +88,7 @@ public:
bool IsMultiSelection();
std::vectorScRangeNameLine GetSelectedEntries();
+DECL_LINK( ScrollHdl, void*);
DECL_LINK( HeaderEndDragHdl, void*);
};
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index d471c74..de9e386 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -60,7 +60,8 @@ String createEntryString(const ScRangeNameLine rLine)
ScRangeManagerTable::ScRangeManagerTable( Window* pWindow,
boost::ptr_maprtl::OUString, ScRangeName rRangeMap ):
SvTabListBox( pWindow, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP
),
maHeaderBar( pWindow, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
-maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE))
+maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)),
+mrRangeMap( rRangeMap )
{
Size aBoxSize( pWindow-GetOutputSizePixel() );
@@ -84,12 +85,16 @@ ScRangeManagerTable::ScRangeManagerTable( Window* pWindow,
boost::ptr_maprtl::O
maHeaderBar.SetEndDragHdl( LINK( this, ScRangeManagerTable,
HeaderEndDragHdl ) );
+Init();
Show();
maHeaderBar.Show();
SetSelectionMode(MULTIPLE_SELECTION);
-Init(rRangeMap);
if (GetEntryCount())
+{
SetCurEntry(GetEntryOnPos(0));
+CheckForFormulaString();
+}
+SetScrolledHdl( LINK( this, ScRangeManagerTable, ScrollHdl ) );
}
ScRangeManagerTable::~ScRangeManagerTable()
@@ -116,11 +121,11 @@ void ScRangeManagerTable::GetLine(ScRangeNameLine rLine,
SvLBoxEntry* pEntry)
rLine.aScope = GetEntryText(pEntry, 2);
}
-void ScRangeManagerTable::Init(const boost::ptr_maprtl::OUString,
ScRangeName rRangeMap)
+void ScRangeManagerTable::Init()
{
Clear();
-for (boost::ptr_maprtl::OUString, ScRangeName::const_iterator itr =
rRangeMap.begin();
-itr != rRangeMap.end(); ++itr)
+for (boost::ptr_maprtl::OUString, ScRangeName::const_iterator itr =
mrRangeMap.begin();
+itr != mrRangeMap.end(); ++itr)
{
const ScRangeName* pLocalRangeName = itr-second;
ScRangeNameLine aLine;
@@ -134,13 +139,44 @@ void ScRangeManagerTable::Init(const
boost::ptr_maprtl::OUString, ScRangeName
if (!it-second-HasType(RT_DATABASE)
!it-second-HasType(RT_SHARED))
{
aLine.aName = it-second-GetName();
-it-second-GetSymbol(aLine.aExpression);
addEntry(aLine);
}
}
}
}
+const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine
rLine)
+{
+const ScRangeName* pRangeName;
+if (rLine.aScope == maGlobalString)
+pRangeName =
mrRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))-second;
+else
+pRangeName = mrRangeMap.find(rLine.aScope)-second;
+
+return
pRangeName-findByUpperName(ScGlobal::pCharClass-upper(rLine.aName));
+}
+
+
+
+void ScRangeManagerTable::CheckForFormulaString()
+{
+for (SvLBoxEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry =
GetNextEntryInView(pEntry))
+{
+std::mapSvLBoxEntry*, bool::const_iterator itr =
maCalculatedFormulaEntries.find(pEntry);
+if (itr ==
[Libreoffice-commits] .: configure.in
configure.in |4 1 file changed, 4 insertions(+) New commits: commit a43caa76d9da112f40a973911e779fc42c5af3c3 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Nov 29 11:04:16 2011 +0100 Add checking msg for tarball fetching so we know if it is on/off diff --git a/configure.in b/configure.in index 4bb2f1f..d925ba4 100644 --- a/configure.in +++ b/configure.in @@ -2547,8 +2547,12 @@ if test -z $TARFILE_LOCATION; then fi AC_SUBST(TARFILE_LOCATION) +AC_MSG_CHECKING([whether we want to fetch tarballs]) if test z$enable_fetch_external != zno ; then +AC_MSG_RESULT([yes]) DO_FETCH_TARBALLS=YES +else +AC_MSG_RESULT([no]) fi AC_SUBST(DO_FETCH_TARBALLS) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.10.patch libvisio/libvisio-0.0.11.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.10.patch | 20 libvisio/libvisio-0.0.11.patch | 20 libvisio/makefile.mk |6 +++--- ooo.lst.in |2 +- 4 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 11f91f16cad5dc01a1b6375134c8f5132acf3415 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Nov 29 11:50:52 2011 +0100 Uploading new release of libvisio diff --git a/libvisio/libvisio-0.0.10.patch b/libvisio/libvisio-0.0.10.patch deleted file mode 100644 index 5bd3265..000 --- a/libvisio/libvisio-0.0.10.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.10/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.10/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.11.patch b/libvisio/libvisio-0.0.11.patch new file mode 100644 index 000..91e9700 --- /dev/null +++ b/libvisio/libvisio-0.0.11.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.11/src/lib/libvisio_utils.h misc/build/libvisio-0.0.11/src/lib/libvisio_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index a9b20c2..fa99223 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.10 -TARFILE_MD5=8f107ffb3fc9d9b920b7bbd0bc79c7e8 +TARFILE_NAME=libvisio-0.0.11 +TARFILE_MD5=a8b25a0bf696fd126a08319d88998492 PATCH_FILES=\ -libvisio-0.0.10.patch +libvisio-0.0.11.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index ba7676a..51695cf 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -87,7 +87,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2 +a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in set_soenv.in
configure.in |1 + set_soenv.in |1 + 2 files changed, 2 insertions(+) New commits: commit b8a2970f24872ee1620f3cc2381055b14484dd63 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Nov 29 13:09:06 2011 +0100 Export DO_FETCH_TARBALLS in set_soenv. diff --git a/configure.in b/configure.in index d925ba4..3e3671f 100644 --- a/configure.in +++ b/configure.in @@ -2553,6 +2553,7 @@ if test z$enable_fetch_external != zno ; then DO_FETCH_TARBALLS=YES else AC_MSG_RESULT([no]) +DO_FETCH_TARBALLS=NO fi AC_SUBST(DO_FETCH_TARBALLS) diff --git a/set_soenv.in b/set_soenv.in index b723e14..10a0937 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1484,6 +1484,7 @@ ToFile( LIBDIR,@LIBDIR@, e ); ToFile( DATADIR, @DATADIR@,e ); ToFile( MANDIR,@MANDIR@, e ); ToFile( DOCDIR,@DOCDIR@, e ); +ToFile( DO_FETCH_TARBALLS, @DO_FETCH_TARBALLS, e ); ToFile( BUILD_MOZAB, @BUILD_MOZAB@,e ); ToFile( PREBUILD_MOZAB,$PREBUILD_MOZAB,e ); ToFile( MOZILLA_VERSION, $MOZILLA_VERSION, e ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 -- 1 file changed, 2 deletions(-) New commits: commit 55da6a0907fe3679dd09de4c9f29ad32cb2a5ab5 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Nov 29 13:18:15 2011 +0100 these deps are already handled in gbuild diff --git a/Makefile.in b/Makefile.in index 1375db4..2df1863 100644 --- a/Makefile.in +++ b/Makefile.in @@ -102,6 +102,4 @@ findunusedcode: @grep ::.*\( unusedcode.all | grep -v ^cppu:: unusedcode.easy #as long as we are not completely gbuildified we need to explicitly depend on the build/install -unitcheck: build -subsequentcheck: dev-install #debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !? ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf README.cross
README.cross |1 - distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeMinGW.conf |1 - distro-configs/LibreOfficeOpenBSD.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - 5 files changed, 5 deletions(-) New commits: commit 96be3a199abb931068d15893f4bc83a24375d362 Author: Jan Holesovsky ke...@suse.cz Date: Tue Nov 29 13:41:09 2011 +0100 --with-system-libxslt is gone, remove it from the distro-configs. diff --git a/README.cross b/README.cross index 204b86d..cdcb37c 100644 --- a/README.cross +++ b/README.cross @@ -176,7 +176,6 @@ CXX_FOR_BUILD=ccache g++ --with-system-libwpg --with-system-libwps --with-system-libxml ---with-system-libxslt --with-system-lpsolve --with-system-mythes --with-system-neon diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index ddf6671..c00e6b9 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -8,7 +8,6 @@ --without-system-openssl --without-system-mozilla --without-system-mesa-headers ---without-system-libxslt --without-system-libxml --without-system-jpeg --without-system-jars diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index aad9039..fcca57a 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -13,7 +13,6 @@ --with-system-icu --with-system-libpng --with-system-libxml ---with-system-libxslt --with-system-lpsolve --with-system-mythes --with-system-neon diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 8f94b4b..b17175c 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -39,7 +39,6 @@ --with-system-jars --with-system-jpeg --with-system-libxml ---with-system-libxslt --with-system-mesa-headers --with-system-neon --with-system-openssl diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index f000ae6..31b3db4 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -58,7 +58,6 @@ --without-system-openssl --without-system-mozilla --without-system-mesa-headers ---without-system-libxslt --without-system-libxml --without-system-jpeg --without-system-jars ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/prj
libvisio/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c17daddf7b51f685da0f7b83951916ba791a315c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Nov 29 16:55:19 2011 +0100 libvisio should depend on boost now diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst index 7ce8628..77fec71 100644 --- a/libvisio/prj/build.lst +++ b/libvisio/prj/build.lst @@ -1,3 +1,3 @@ -vsdlibvisio: LIBWPD:libwpd LIBWPG:libwpg soltools NULL +vsdlibvisio: LIBWPD:libwpd LIBWPG:libwpg BOOST::boost soltools NULL vsdlibvisiousr1- all vsd_mkout NULL vsdlibvisionmake - all vsd_libvisio NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/inputwin.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 71e77655660fa719ca0e91c7daa94e045e3006a3
Author: Noel Power noel.po...@novell.com
Date: Tue Nov 29 15:58:48 2011 +
detect TEXTMODIFIED event from EditEngine ( and add missing StopEditEngine )
not sure if the StopEditEngine method ever gets called but we should have
it tunnel to the base class just in case.
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 63265f9..650293a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1180,7 +1180,10 @@ IMPL_LINK(ScMultiTextWnd, ModifyHdl, EENotify*, pNotify)
IMPL_LINK(ScMultiTextWnd, NotifyHdl, EENotify*, pNotify)
{
// need to process EE_NOTIFY_TEXTVIEWSCROLLED here
-if ( pNotify pNotify-eNotificationType == EE_NOTIFY_TEXTVIEWSCROLLED )
+// sometimes when pasting we don't seem to get EE_NOTIFY_TEXTVIEWSCROLLED
+// but we always seem to get EE_NOTIFY_TEXTMODIFIED
+if ( pNotify ( pNotify-eNotificationType == EE_NOTIFY_TEXTVIEWSCROLLED
+ || pNotify-eNotificationType == EE_NOTIFY_TEXTMODIFIED ) )
SetScrollBarRange();
return 0;
}
@@ -1362,8 +1365,9 @@ void ScMultiTextWnd::InitEditEngine(SfxObjectShell*
pObjSh)
}
}
-void ScMultiTextWnd::StopEditEngine( sal_Bool /*bAll*/ )
+void ScMultiTextWnd::StopEditEngine( sal_Bool bAll )
{
+ScTextWnd::StopEditEngine( bAll );
}
void ScMultiTextWnd::SetTextString( const String rNewString )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in download ooo.lst.in set_soenv.in
configure.in | 21 + download |6 ++ ooo.lst.in |1 + set_soenv.in | 10 ++ 4 files changed, 34 insertions(+), 4 deletions(-) New commits: commit 8aa73a8f74cfcdc2fffdc16c8094bd257c8ade0d Author: Kalman Szalai - KAMI kami...@gmail.com Date: Tue Nov 29 17:12:02 2011 +0100 Add enable-oxygenoffice configure switch Now only handling brand downloading diff --git a/configure.in b/configure.in index 3e3671f..005a68e 100644 --- a/configure.in +++ b/configure.in @@ -784,6 +784,11 @@ AC_ARG_ENABLE(extra-font, [Add extra font content.]), ,) +AC_ARG_ENABLE(oxygenoffice, +AS_HELP_STRING([--enable-oxygenoffice], +[Download OxygenOffice branding and set custom settings.]), +,) + AC_ARG_ENABLE(lomenubar, AS_HELP_STRING([--enable-lomenubar], [Enable global menu support.]), @@ -8437,6 +8442,22 @@ AC_SUBST(WITH_EXTRA_FONT) AC_SUBST(OOOP_FONTS_PACK) dnl === +dnl Test whether to download OxygenOffice branding and set custom settings +dnl === +AC_MSG_CHECKING([whether to download OxygenOffice branding and set custom settings]) +if test z$enable_oxygenoffice = z -o z$enable_oxygenoffice = zno ; then +AC_MSG_RESULT([no]) +ENABLE_OXYGENOFFICE=NO +else +AC_MSG_RESULT([yes]) +ENABLE_OXYGENOFFICE=YES +OXYGENOFFICE_PACK=18bf204479ff641d99a88cd71f6f25f7-oxygenoffice-001.zip +BUILD_TYPE=$BUILD_TYPE OXYGENOFFICE +fi +AC_SUBST(ENABLE_OXYGENOFFICE) +AC_SUBST(OXYGENOFFICE_PACK) + +dnl === dnl Test whether to build global menu support dnl === AC_MSG_CHECKING([whether to build global menu support]) diff --git a/download b/download index ded21af..716bd53 100755 --- a/download +++ b/download @@ -278,6 +278,12 @@ for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLAT unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source done +if [ $OXYGENOFFICE_PACK = YES ] ; then +check_file $TARFILE_LOCATION/$OXYGENOFFICE_PACK +echo Unpacking OxygenOffice '$OXYGENOFFICE_PACK' ... +unzip -o -q $TARFILE_LOCATION/$OXYGENOFFICE_PACK -d $SRC_ROOT/src +fi + # Extensions copy for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_RU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do check_file $TARFILE_LOCATION/$pack diff --git a/ooo.lst.in b/ooo.lst.in index 51695cf..991bca5 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -98,6 +98,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_TEMPLATES_PACK@ @OOOP_FONTS_PACK@ @OOOP_SAMPLES_PACK@ +@OXYGENOFFICE_PACK@ @CT2N_EXTENSION_PACK@ @BARCODE_EXTENSION_PACK@ @DIAGRAM_EXTENSION_PACK@ diff --git a/set_soenv.in b/set_soenv.in index 3011c09..b399531 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1942,10 +1942,12 @@ ToFile( USE_FT_EMBOLDEN, @USE_FT_EMBOLDEN@, e ); ToFile( LIBXML_CFLAGS, @LIBXML_CFLAGS@,e ); ToFile( LIBXML_LIBS, @LIBXML_LIBS@, e ); ToFile( SYSTEM_EXPAT, @SYSTEM_EXPAT@, e ); -ToFile( WITH_EXTRA_GALLERY, @WITH_EXTRA_GALLERY@, e ); -ToFile( WITH_EXTRA_TEMPLATE, @WITH_EXTRA_TEMPLATE@, e ); -ToFile( WITH_EXTRA_SAMPLE, @WITH_EXTRA_SAMPLE@, e ); -ToFile( WITH_EXTRA_FONT, @WITH_EXTRA_FONT@, e ); +ToFile( WITH_EXTRA_GALLERY,@WITH_EXTRA_GALLERY@, e ); +ToFile( WITH_EXTRA_TEMPLATE,@WITH_EXTRA_TEMPLATE@, e ); +ToFile( WITH_EXTRA_SAMPLE, @WITH_EXTRA_SAMPLE@, e ); +ToFile( WITH_EXTRA_FONT, @WITH_EXTRA_FONT@, e ); +ToFile( ENABLE_OXYGENOFFICE,@ENABLE_OXYGENOFFICE@,e ); +ToFile( OXYGENOFFICE_PACK,@OXYGENOFFICE_PACK@,e ); ToFile( SYSTEM_DB, @SYSTEM_DB@,e ); ToFile( SYSTEM_DB_CFLAGS, @SYSTEM_DB_CFLAGS@, e ); ToFile( DB_LIB,@DB_LIB@, e ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: drawinglayer/source oox/inc oox/source sc/source sfx2/source testautomation/writer
drawinglayer/source/processor2d/helperchartrenderer.cxx|2 +-
oox/inc/oox/xls/condformatbuffer.hxx |4 ++--
oox/inc/oox/xls/worksheethelper.hxx|2 +-
oox/source/xls/worksheethelper.cxx |4 ++--
sc/source/filter/inc/xicontent.hxx |4 ++--
sc/source/filter/inc/xiroot.hxx|4 ++--
sfx2/source/doc/doc.src|2 +-
testautomation/writer/optional/includes/number/w_205a_.inc |4 ++--
testautomation/writer/optional/includes/number/w_207_.inc |2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 37f509e15d74e005cbe264dd27106359c4165657
Author: Lior Kaplan kaplanl...@gmail.com
Date: Tue Nov 29 18:17:18 2011 +0200
Replace formattings with formatting
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx
b/drawinglayer/source/processor2d/helperchartrenderer.cxx
index 84e70ec..bf7dec5 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx
@@ -90,7 +90,7 @@ namespace drawinglayer
// needs to be expressed in the MapMode for the
PrettyPainter;
// else it would call
ChartModelHelper::setPageSize(...) with the
// changed size what really will change the chart
model and leads
-// to re-layouts and re-formattings
+// to re-layouts and re-formatting
const MapMode
aOldMapMode(rOutputDevice.GetMapMode());
basegfx::B2DVector aVTScale, aScale, aTranslate;
double fRotate, fShearX;
diff --git a/oox/inc/oox/xls/condformatbuffer.hxx
b/oox/inc/oox/xls/condformatbuffer.hxx
index 3dba25b..4354178 100644
--- a/oox/inc/oox/xls/condformatbuffer.hxx
+++ b/oox/inc/oox/xls/condformatbuffer.hxx
@@ -171,7 +171,7 @@ public:
/** Imports settings from the CFHEADER record. */
voidimportCfHeader( BiffInputStream rStrm );
-/** Creates all conditional formattings in the Calc document. */
+/** Creates all conditional formatting in the Calc document. */
voidfinalizeImport();
/** Converts an OOXML condition operator token to the API constant. */
@@ -182,7 +182,7 @@ private:
private:
typedef RefVector CondFormat CondFormatVec;
-CondFormatVec maCondFormats; /// All conditional formattings in
a sheet.
+CondFormatVec maCondFormats; /// All conditional formatting in
a sheet.
};
//
diff --git a/oox/inc/oox/xls/worksheethelper.hxx
b/oox/inc/oox/xls/worksheethelper.hxx
index c824c4e..33ae0a8 100644
--- a/oox/inc/oox/xls/worksheethelper.hxx
+++ b/oox/inc/oox/xls/worksheethelper.hxx
@@ -255,7 +255,7 @@ public:
/** Returns the buffer for cell contents and cell formatting. */
SheetDataBuffergetSheetData() const;
-/** Returns the conditional formattings in this sheet. */
+/** Returns the conditional formatting in this sheet. */
CondFormatBuffer getCondFormats() const;
/** Returns the buffer for all cell comments in this sheet. */
CommentsBuffer getComments() const;
diff --git a/oox/source/xls/worksheethelper.cxx
b/oox/source/xls/worksheethelper.cxx
index ba5014f..e8a2972 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -277,7 +277,7 @@ public:
/** Returns the buffer for cell contents and cell formatting. */
inline SheetDataBuffer getSheetData() { return maSheetData; }
-/** Returns the conditional formattings in this sheet. */
+/** Returns the conditional formatting in this sheet. */
inline CondFormatBuffer getCondFormats() { return maCondFormats; }
/** Returns the buffer for all cell comments in this sheet. */
inline CommentsBuffer getComments() { return maComments; }
@@ -396,7 +396,7 @@ private:
ValidationModelList maValidations; /// Cell ranges containing data
validation settings.
ValueRangeSet maManualRowHeights; /// Rows that need manual height
independent from own settings.
SheetDataBuffer maSheetData;/// Buffer for cell contents and
cell formatting.
-CondFormatBuffermaCondFormats; /// Buffer for conditional
formattings.
+CondFormatBuffermaCondFormats; /// Buffer for conditional
formatting.
CommentsBuffer maComments; /// Buffer for all cell comments
in this sheet.
AutoFilterBuffermaAutoFilters; /// Sheet auto filters (not
associated to a table).
QueryTableBuffermaQueryTables; /// Buffer for all web query
tables in this sheet.
diff --git a/sc/source/filter/inc/xicontent.hxx
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/inc/tabcont.hxx |1 -
sc/source/ui/unoobj/docuno.cxx |7 ++-
sc/source/ui/view/tabcont.cxx | 16
sc/source/ui/view/tabview3.cxx |2 +-
4 files changed, 7 insertions(+), 19 deletions(-)
New commits:
commit 36d950fb16d214b7163223fc2b51f0990f96e494
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Nov 29 11:50:03 2011 -0500
Let's not over-activate tab controls unnecessarily.
This interfares with the preview shell passing selected tabs back to
the view shell, by always selecting the first tab unconditionally.
The tabs get painted fine even without this call, so let's remove it.
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index 6e922fa..5691234 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -79,7 +79,6 @@ public:
voidUpdateInputContext();
voidUpdateStatus();
-voidActivateView(sal_Bool bActivate);
voidSetSheetLayoutRTL( sal_Bool bSheetRTL );
};
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 5666349..230736a 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -377,22 +377,6 @@ void ScTabControl::UpdateStatus()
}
}
-void ScTabControl::ActivateView(sal_Bool bActivate)
-{
-ScMarkData rMark = pViewData-GetMarkData();
-
-sal_uInt16 nCurId = GetCurPageId();
-if (!nCurId) return;// kann vorkommen, wenn bei Excel-Import
alles versteckt ist
-sal_uInt16 nPage = nCurId - 1;
-
-if (bActivate)
-{
-SelectPage( nPage+1, sal_True );
-rMark.SelectTable( static_castSCTAB(nPage), sal_True );
-}
-Invalidate();
-}
-
void ScTabControl::SetSheetLayoutRTL( sal_Bool bSheetRTL )
{
SetEffectiveRTL( bSheetRTL );
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 8bedb88..556d3bf 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2291,7 +2291,7 @@ void ScTabView::ActivateView( bool bActivate, bool bFirst
)
pHdl-EnterHandler();
}
}
-pTabControl-ActivateView(bActivate);
+
PaintExtras();
aViewData.Activate(bActivate);
commit 654c4be03c86cf00f0c66f876caa392e9391f8f5
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Nov 29 11:24:27 2011 -0500
Let's check the validity of sheet indices. You never know...
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b5de718..b9be493 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -899,8 +899,13 @@ bool ScModelObj::FillRenderMarkData( const uno::Any
aSelection,
{
uno::Sequencesal_Int32 aSelected =
xSelectedSheets-getSelectedSheets();
ScMarkData::MarkedTabsType aSelectedTabs;
+SCTAB nMaxTab = pDocShell-GetDocument()-GetTableCount() -1;
for (sal_Int32 i = 0, n = aSelected.getLength(); i n; ++i)
-aSelectedTabs.insert(static_castSCTAB(aSelected[i]));
+{
+SCTAB nSelected = static_castSCTAB(aSelected[i]);
+if (ValidTab(nSelected, nMaxTab))
+aSelectedTabs.insert(static_castSCTAB(aSelected[i]));
+}
rMark.SetSelectedTabs(aSelectedTabs);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: g
g | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit a7069c2aa24f40b8e47d148b7201f879faa2ff32
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Tue Nov 29 10:59:48 2011 -0600
git rev-parse argument are not files, no need to try to find abs-path
This was causing some error message on Windows
diff --git a/g b/g
index a47f3df..5b39c46 100755
--- a/g
+++ b/g
@@ -220,14 +220,19 @@ while shift ; do
exit 1
}
fi
-
-# make the paths absolute
-FILES[$FILESNUM]=$(perl -e 'use Cwd abs_path; print
abs_path(shift);' $PARAM)
-if [ -z ${FILES[$FILESNUM]} -o ! -e ${FILES[$FILESNUM]} ] ; then
-# it is probably not a file, but a tag name, or something
+if [ $COMMAND == rev-parse ] ; then
+# this is not a file
FILES[$FILESNUM]=$PARAM
-fi
-FILESNUM=$(($FILESNUM+1))
+FILESNUM=$(($FILESNUM+1))
+else
+# make the paths absolute
+FILES[$FILESNUM]=$(perl -e 'use Cwd abs_path; print
abs_path(shift);' $PARAM)
+if [ -z ${FILES[$FILESNUM]} -o ! -e ${FILES[$FILESNUM]} ] ;
then
+# it is probably not a file, but a tag name, or something
+FILES[$FILESNUM]=$PARAM
+fi
+FILESNUM=$(($FILESNUM+1))
+ fi
fi
done
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - automation/packimages automation/source desktop/win32 filter/source i18npool/source solenv/gbuild writerfilter/source
automation/packimages/Makefile |1 + automation/source/testtool/Makefile |2 ++ desktop/win32/source/setup/Makefile |1 + filter/source/svg/Makefile |1 + i18npool/source/breakiterator/Makefile |1 + i18npool/source/indexentry/Makefile |1 + i18npool/source/localedata/Makefile |1 + i18npool/source/textconversion/Makefile |1 + solenv/gbuild/UnoApiTarget.mk |6 +++--- writerfilter/source/Makefile|2 ++ 10 files changed, 14 insertions(+), 3 deletions(-) New commits: commit dd750cf42b308cdbf48ebd54fdd6f4fa0865b91a Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Nov 29 18:10:55 2011 +0100 with announce letters shalt thou count to three, no more, no less diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 5511ec5..e5415df 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -158,13 +158,13 @@ endef .PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%) $(call gb_UnoApiOutTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNOAPI,1) + $(call gb_Output_announce,$*,$(false),UNO,1) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApiOutTarget_get_target,$*)) .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) $(call gb_UnoApiTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNOAPI,1) + $(call gb_Output_announce,$*,$(false),UNO,1) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApiTarget_get_target,$*)) -rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\ @@ -213,7 +213,7 @@ $(call gb_UnoApiTarget_get_target,%): $(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*) $(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$,/,$(UNOAPI_MERGE))) $(if $(UNOAPI_REFERENCE), \ - $(call gb_Output_announce,$*,$(true),RDBCHEK,4) \ + $(call gb_Output_announce,$*,$(true),DBc,4) \ $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@)) $(if $(gb_UnoApiTarget_IDLFILES_$*), \ $(call gb_Output_announce,$*,$(true),HPP,4) \ commit b1d20f68474d91d8accafdeb403526b16a636220 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Nov 29 18:04:42 2011 +0100 set gb_PARTIALBUILD in CustomTargets diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile index 69631bb..a26f117 100644 --- a/automation/packimages/Makefile +++ b/automation/packimages/Makefile @@ -23,6 +23,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +gb_PARTIALBUILD:=T include $(GBUILDDIR)/gbuild_simple.mk BINDIR := $(dir $(GBUILDDIR))bin diff --git a/automation/source/testtool/Makefile b/automation/source/testtool/Makefile index f0d1d13..9b1e007 100644 --- a/automation/source/testtool/Makefile +++ b/automation/source/testtool/Makefile @@ -23,6 +23,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. + +gb_PARTIALBUILD:=T include $(GBUILDDIR)/gbuild_simple.mk BASEDIR := $(dir $(firstword $(MAKEFILE_LIST))) diff --git a/desktop/win32/source/setup/Makefile b/desktop/win32/source/setup/Makefile index c5337ee..004f490 100644 --- a/desktop/win32/source/setup/Makefile +++ b/desktop/win32/source/setup/Makefile @@ -23,6 +23,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +gb_PARTIALBUILD:=T include $(GBUILDDIR)/gbuild_simple.mk DESTDIR := $(WORKDIR)/CustomTarget/desktop/win32/source/setup diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile index 20ed8f8..31a4244 100644 --- a/filter/source/svg/Makefile +++ b/filter/source/svg/Makefile @@ -28,6 +28,7 @@ SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST WORKDIR_FILTER := . +gb_PARTIALBUILD:=T include $(GBUILDDIR)/gbuild.mk filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile index 011dd6f..9f1a6ce 100644 --- a/i18npool/source/breakiterator/Makefile +++ b/i18npool/source/breakiterator/Makefile @@ -28,6 +28,7 @@ all : OpenOffice_dat.c data/dict_ja.cxx data/dict_zh.cxx +gb_PARTIALBUILD:=T include $(GBUILDDIR)/gbuild_simple.mk data: diff --git a/i18npool/source/indexentry/Makefile b/i18npool/source/indexentry/Makefile index c5335dc..cb0212c 100644 --- a/i18npool/source/indexentry/Makefile +++ b/i18npool/source/indexentry/Makefile @@ -28,6 +28,7 @@ all : $(subst .txt,.cxx,$(notdir $(wildcard
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.0'
Tag 'libreoffice-3.5.0.0' created by Petr Mladek pmla...@suse.cz at
2011-11-29 16:53 +0100
Tag $lo_version_tag (${vendor_use:+$vendor LO }$lo_version_app-$lo_release_id)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)
iQIcBAABAgAGBQJO1Q35AAoJEPQ0oe+v7q6jQSsQAI9Ca4hSf3uAGLnJHQmMLjHP
UxZQ1LKFlDt8cp3LzkRctd4+7Nk5/C+TNU7tZsrWGGIKMQtgRT+muZygl2wNv2t6
KenWvNLhSLa4uZLds/wOmby1BsXG0Yzb7mn0R3dNMZePzMw8QeQT+2+QYd30beu9
gTXV633xwtyDw0Wiej0Kzdm/SbcfqaMvKuOO5TO2t8gwtNROZiiAkhPuwlyWTkTp
GOtNkC1fu9mrdsUrCzUk25JsGSxmGSF6oRXQdajQQyzf9fykbSRSGm1KUTFQhnX2
vr1s9p4JbrVke41trVrO+jSBLbbDDku7QVtbYpdgiJspTYgAdaqqIP7hQWkXQ4bm
excHMR6hgqLSevxawX7qxKyzAnahvL3DAuquEeN6QxnaNfvRx8Rf1ei+nMLMH5Oz
NDCOEYgeGfLyNe6HKHcZQtaE0i5QJuO3ucMffJ5893SQ83r6+PZKNaR7vGTCHRTU
Bo+atXkmMP5GhqrdhSJa1eJqtgAToYzJQ0Dgdr5RmZiDQa5Mc7VNB5T4kCYhZXAL
CtEy2ayKx79+boqQ3bXV7XYjnFpdWZUjH+J1yBbxoqGq/bBO9VPQ5vbFuyOt8grd
ktPGDkV4LD/PCQ/l+DRGJYiHyqilcqUzIovSY/wItYYjaKtk6gkzqS+J8w9L4L1f
9dNo51OSJwDIEZ6BGtT6
=pz5v
-END PGP SIGNATURE-
Changes since windows_build_successful_2011_11_08-1229:
---
0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source
connectivity/source/drivers/postgresql/pq_array.cxx |6
-
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 18
+---
connectivity/source/drivers/postgresql/pq_connection.cxx| 42
+-
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 39
++---
connectivity/source/drivers/postgresql/pq_driver.cxx|6
-
connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx | 34
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 13
+--
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 13
++-
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx | 17
+---
connectivity/source/drivers/postgresql/pq_statics.cxx |7
-
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |8
-
connectivity/source/drivers/postgresql/pq_xbase.cxx |2
connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx |2
connectivity/source/drivers/postgresql/pq_xindexes.cxx |1
connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx |2
connectivity/source/drivers/postgresql/pq_xuser.cxx |4
16 files changed, 119 insertions(+), 95 deletions(-)
New commits:
commit 1932529adf3a6f8b8f4785e4412e5f0deb50af45
Author: Michael Meeks michael.me...@suse.com
Date: Tue Nov 29 17:32:05 2011 +
postgresql: work around uninitialized warning.
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 24cc8e0..7bca582 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1872,7 +1872,7 @@ static void columnMetaData2DatabaseTypeDescription(
SequenceAnyVector::iterator ii = vec.begin();
OUString lastTableOid;
-sal_Int32 index;
+sal_Int32 index = 0;
Sequence Sequence Any ret( vec.size() );
int elements = 0;
for( ; ii != vec.end() ; ++ ii )
commit 4cc501d8173373e9656ae5e568b43e3cb90587e7
Author: Michael Meeks michael.me...@suse.com
Date: Tue Nov 29 17:18:30 2011 +
WaE: sizeable postgresql warning cleanup
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx
b/connectivity/source/drivers/postgresql/pq_array.cxx
index dcccd80..5158d9b 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -88,7 +88,7 @@ sal_Int32 Array::getBaseType( )
}
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any Array::getArray(
-const ::com::sun::star::uno::Reference
::com::sun::star::container::XNameAccess typeMap )
+const ::com::sun::star::uno::Reference
::com::sun::star::container::XNameAccess /* typeMap */ )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
return m_data;
@@ -97,7 +97,7 @@ sal_Int32 Array::getBaseType( )
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any
Array::getArrayAtIndex(
sal_Int32 index,
sal_Int32 count,
-const ::com::sun::star::uno::Reference
::com::sun::star::container::XNameAccess typeMap )
+const ::com::sun::star::uno::Reference
::com::sun::star::container::XNameAccess /* typeMap */ )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
checkRange( index, count );
@@ -114,7 +114,7 @@ sal_Int32 Array::getBaseType( )
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet
Array::getResultSetAtIndex(
sal_Int32 index,
sal_Int32 count,
-const ::com::sun::star::uno::Reference
::com::sun::star::container::XNameAccess typeMap )
+const ::com::sun::star::uno::Reference
::com::sun::star::container::XNameAccess /* typeMap */ )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
checkRange( index, count );
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 5c5bee5..8318080 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -583,39 +583,39 @@ Sequence sal_Int8 BaseResultSet::getBytes( sal_Int32
columnIndex )
}
// LEM TODO: these look like they are missing an actual implementation
-Reference ::com::sun::star::io::XInputStream
BaseResultSet::getBinaryStream( sal_Int32 columnIndex )
+Reference ::com::sun::star::io::XInputStream
BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ )
throw (SQLException, RuntimeException)
{
return 0;
}
-Reference ::com::sun::star::io::XInputStream
[Libreoffice-commits] .: sw/Library_sw.mk sw/source
sw/Library_sw.mk |3
sw/source/core/inc/sortedobjs.hxx|7
sw/source/core/inc/sortedobjsimpl.hxx| 64 --
sw/source/core/layout/sortedobjs.cxx | 240 +++-
sw/source/core/layout/sortedobjsimpl.cxx | 302 ---
5 files changed, 235 insertions(+), 381 deletions(-)
New commits:
commit 1e19c59d51b2184bbc2f7b794fe411946553548f
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Nov 29 21:43:38 2011 +0400
merge SwSortedObjsImpl into SwSortedObjs
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index fe1da1c..40e70f3 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -2,7 +2,7 @@
#*
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -315,7 +315,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/layout/sectfrm \
sw/source/core/layout/softpagebreak \
sw/source/core/layout/sortedobjs \
-sw/source/core/layout/sortedobjsimpl \
sw/source/core/layout/ssfrm \
sw/source/core/layout/swselectionlist \
sw/source/core/layout/tabfrm \
diff --git a/sw/source/core/inc/sortedobjs.hxx
b/sw/source/core/inc/sortedobjs.hxx
index 720ff08..afb770a 100644
--- a/sw/source/core/inc/sortedobjs.hxx
+++ b/sw/source/core/inc/sortedobjs.hxx
@@ -27,10 +27,11 @@
/
#ifndef _SORTEDOBJS_HXX
#define _SORTEDOBJS_HXX
-class SwSortedObjsImpl;
-class SwAnchoredObject;
#include sal/types.h
+#include vector
+
+class SwAnchoredObject;
/** class for collecting anchored objects
@@ -56,7 +57,7 @@ class SwAnchoredObject;
class SwSortedObjs
{
private:
-SwSortedObjsImpl* mpImpl;
+std::vector SwAnchoredObject* maSortedObjLst;
public:
SwSortedObjs();
diff --git a/sw/source/core/inc/sortedobjsimpl.hxx
b/sw/source/core/inc/sortedobjsimpl.hxx
deleted file mode 100644
index 1b23cd1..000
--- a/sw/source/core/inc/sortedobjsimpl.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _SORTEDOBJSIMPL_HXX
-#define _SORTEDOBJSIMPL_HXX
-
-#include vector
-#include sal/types.h
-#include fmtanchr.hxx
-
-class SwAnchoredObject;
-class SwTxtFrm;
-
-class SwSortedObjsImpl
-{
-private:
-std::vector SwAnchoredObject* maSortedObjLst;
-
-public:
-SwSortedObjsImpl();
-~SwSortedObjsImpl();
-
-sal_uInt32 Count() const;
-
-SwAnchoredObject* operator[]( sal_uInt32 _nIndex );
-
-bool Insert( SwAnchoredObject _rAnchoredObj );
-
-bool Remove( SwAnchoredObject _rAnchoredObj );
-
-bool Contains( const SwAnchoredObject _rAnchoredObj ) const;
-
-bool Update( SwAnchoredObject _rAnchoredObj );
-
-sal_uInt32 ListPosOf( const SwAnchoredObject _rAnchoredObj ) const;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/sortedobjs.cxx
b/sw/source/core/layout/sortedobjs.cxx
index c5eb79f..3d116ca 100644
--- a/sw/source/core/layout/sortedobjs.cxx
+++ b/sw/source/core/layout/sortedobjs.cxx
@@ -27,51 +27,271 @@
/
#include sortedobjs.hxx
-#include sortedobjsimpl.hxx
+
+#include algorithm
+#include anchoredobject.hxx
+#include fmtanchr.hxx
+#include fmtsrnd.hxx
+#include fmtwrapinfluenceonobjpos.hxx
+#include frmfmt.hxx
+#include pam.hxx
+#include svx/svdobj.hxx
+#include IDocumentDrawModelAccess.hxx
+
+
+using namespace ::com::sun::star;
+
[Libreoffice-commits] .: 2 commits - sc/inc sc/source unotools/source
sc/inc/nameuno.hxx |5 +++--
sc/source/ui/unoobj/nameuno.cxx |4 ++--
unotools/source/ucbhelper/ucbhelper.cxx | 15 +++
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit d3c772229cf93ecb1296a67f4ddf5e73afe41b7e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 29 20:03:10 2011 +0100
Use rtl::Reference.
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 4872373..a83748c 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -49,6 +49,7 @@
#include cppuhelper/implbase3.hxx
#include cppuhelper/implbase5.hxx
#include cppuhelper/implbase6.hxx
+#include rtl/ref.hxx
class ScDocShell;
class ScRangeName;
@@ -67,7 +68,7 @@ class ScNamedRangeObj : public ::cppu::WeakImplHelper6
public SfxListener
{
private:
-com::sun::star::uno::Reference com::sun::star::sheet::XNamedRanges
mxParent;
+rtl::Reference ScNamedRangesObj mxParent;
ScDocShell* pDocShell;
String aName;
com::sun::star::uno::Reference com::sun::star::container::XNamed
mxSheet;
@@ -81,7 +82,7 @@ private:
SCTAB GetTab_Impl();
public:
-ScNamedRangeObj( com::sun::star::uno::Reference
com::sun::star::sheet::XNamedRanges xParent, ScDocShell* pDocSh, const
String rNm,
+ScNamedRangeObj( rtl::Reference ScNamedRangesObj
xParent, ScDocShell* pDocSh, const String rNm,
com::sun::star::uno::Reference
com::sun::star::container::XNamed xSheet = com::sun::star::uno::Reference
com::sun::star::container::XNamed ());
virtual ~ScNamedRangeObj();
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 3facf43..60f3025 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -97,7 +97,7 @@ bool lcl_UserVisibleName(const ScRangeData rData)
return !rData.HasType(RT_DATABASE) !rData.HasType(RT_SHARED);
}
-ScNamedRangeObj::ScNamedRangeObj( Reference sheet::XNamedRanges xParent,
ScDocShell* pDocSh, const String rNm, Referencecontainer::XNamed xSheet):
+ScNamedRangeObj::ScNamedRangeObj( rtl::Reference ScNamedRangesObj xParent,
ScDocShell* pDocSh, const String rNm, Referencecontainer::XNamed xSheet):
mxParent(xParent),
pDocShell( pDocSh ),
aName( rNm ),
@@ -213,7 +213,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName,
const ScTokenArray* p
if (pNewRanges-insert(pNew))
{
ScDocFunc aFunc(*pDocShell);
-aFunc.SetNewRangeNames(pNewRanges,
dynamic_castScNamedRangesObj*(mxParent.get())-IsModifyAndBroadcast(), nTab);
+aFunc.SetNewRangeNames(pNewRanges, mxParent-IsModifyAndBroadcast(),
nTab);
aName = aInsName; //! broadcast?
}
commit ca6052b9a62596902f901f8fa36680d7abe989f5
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 29 20:02:50 2011 +0100
Special casing can be removed again.
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx
b/unotools/source/ucbhelper/ucbhelper.cxx
index 935620f..8487816 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -483,9 +483,6 @@ bool utl::UCBContentHelper::IsSubPath(
bool utl::UCBContentHelper::EqualURLs(
rtl::OUString const url1, rtl::OUString const url2)
{
-if (url1.isEmpty() || url2.isEmpty()) {
-return false;
-}
ucbhelper::ContentBroker * broker = ucbhelper::ContentBroker::get();
if (broker == 0) {
throw css::uno::RuntimeException(
@@ -493,11 +490,13 @@ bool utl::UCBContentHelper::EqualURLs(
RTL_CONSTASCII_USTRINGPARAM(no ucbhelper::ContentBroker)),
css::uno::Referencecss::uno::XInterface());
}
-return 0 == broker-getContentProviderInterface()-compareContentIds(
-(broker-getContentIdentifierFactoryInterface()-
- createContentIdentifier(canonic(url1))),
-(broker-getContentIdentifierFactoryInterface()-
- createContentIdentifier(canonic(url2;
+return
+broker-getContentProviderInterface()-compareContentIds(
+(broker-getContentIdentifierFactoryInterface()-
+ createContentIdentifier(canonic(url1))),
+(broker-getContentIdentifierFactoryInterface()-
+ createContentIdentifier(canonic(url2
+== 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icc/source
icc/source/create_sRGB_profile/create_sRGB_profile.cpp |5 +
1 file changed, 5 insertions(+)
New commits:
commit 2c4537471c932b65e6f72e41881b505c4bbad12c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Nov 29 20:00:55 2011 +0100
dont mindlessly touch the icc-header file on every build
- this little gremlin touches the header file everytime it is run
- as icc is very low level, this causes a lot of pointless rebuild
- everything from vcl up gets relinked
- this slows every empty 'make build' down by more than 40 percent
- would really need to check if the file changed before writing, but as we
rarely change icc itself, I didnt bother with that
diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index cceb0c5..2d6b52f 100644
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
@@ -474,6 +474,11 @@ int main(int argc, char* argv[])
profile.Write(out);
out.Close();
+if(FILE *headerfile_exists = fopen(hxx_file_name,r))
+{
+fclose(headerfile_exists);
+exit(0);
+}
FILE *headerfile = fopen(hxx_file_name,w);
//print OpenOffice standard file header
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eef80c23ffc790ae30feb5048e978c48e7b76e73 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Nov 29 20:15:24 2011 +0100 use gb_MINISOLARENV for platform check diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 57387f1..f6a38af 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -151,7 +151,7 @@ $(eval $(call gb_Helper_collect_libtargets)) gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions -ifneq ($(strip $(OS)),) +ifeq ($(strip $(gb_MINISOLARENV)),) include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/Module_sc.mk
sc/Module_sc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 92440ddb00a4f2bc8c2a8dc726c20bca78d5b916 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Nov 29 13:46:44 2011 +0100 move sc's macros_test to the subsequenttest target diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 6a18985..d7d18dd 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -36,11 +36,11 @@ $(eval $(call gb_Module_add_targets,sc,\ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_filters_test \ - CppunitTest_sc_macros_test \ CppunitTest_sc_ucalc \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ +CppunitTest_sc_macros_test \ JunitTest_sc_unoapi \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 17 commits - oox/inc oox/source starmath/source
oox/inc/oox/mathml/importutils.hxx | 17 ++
oox/source/mathml/importutils.cxx | 124 +++--
oox/source/token/tokens.pl | 38 ++---
starmath/source/mathtype.cxx |2
starmath/source/ooxmlexport.cxx|2
starmath/source/ooxmlimport.cxx| 257 ++---
starmath/source/ooxmlimport.hxx|8 +
7 files changed, 359 insertions(+), 89 deletions(-)
New commits:
commit a115442064c3c6a2ea398895159b62040d079cbb
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 29 21:18:39 2011 +0100
import docx m:m
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 530195c..c0d84ab 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -122,6 +122,9 @@ OUString SmOoxmlImport::readOMathArg()
case OPENING( M_TOKEN( groupChr )):
ret += handleGroupChr();
break;
+case OPENING( M_TOKEN( m )):
+ret += handleM();
+break;
case OPENING( M_TOKEN( r )):
ret += handleR();
break;
@@ -398,6 +401,29 @@ OUString SmOoxmlImport::handleGroupChr()
return ret;
}
+OUString SmOoxmlImport::handleM()
+{
+stream.ensureOpeningTag( M_TOKEN( m ));
+OUString allrows;
+do // there must be at least one m:mr
+{
+stream.ensureOpeningTag( M_TOKEN( mr ));
+OUString row;
+do // there must be at least one m:e
+{
+if( !row.isEmpty())
+row += STR( # );
+row += handleE();
+} while( !stream.atEnd() stream.currentToken() == OPENING( M_TOKEN(
e )));
+if( !allrows.isEmpty())
+allrows += STR( ## );
+allrows += row;
+stream.ensureClosingTag( M_TOKEN( mr ));
+} while( !stream.atEnd() stream.currentToken() == OPENING( M_TOKEN( mr
)));
+stream.ensureClosingTag( M_TOKEN( m ));
+return STR( matrix { ) + allrows + STR( } );
+}
+
// NOT complete
OUString SmOoxmlImport::handleR()
{
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index c0786bc..05963d6 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -54,6 +54,7 @@ private:
enum LimLowUpp_t { LimLow, LimUpp };
rtl::OUString handleLimLowUpp( LimLowUpp_t limlowupp );
rtl::OUString handleGroupChr();
+rtl::OUString handleM();
rtl::OUString handleR();
rtl::OUString readOMathArg();
oox::formulaimport::XmlStream stream;
commit 82c78e8790f341373c84f4b5bae5b3834b7b18ce
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 29 21:09:43 2011 +0100
finish reading in while() also when end of stream, just in case
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 2a29d0a..530195c 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -89,7 +89,7 @@ OUString SmOoxmlImport::handleStream()
OUString SmOoxmlImport::readOMathArg()
{
OUString ret;
-while( stream.currentToken() != CLOSING( stream.currentToken()))
+while( !stream.atEnd() stream.currentToken() != CLOSING(
stream.currentToken()))
{
if( !ret.isEmpty())
ret += STR( );
@@ -409,7 +409,7 @@ OUString SmOoxmlImport::handleR()
stream.ensureClosingTag( OOX_TOKEN( doc, rPr ));
}
OUString text;
-while( stream.currentToken() != CLOSING( stream.currentToken()))
+while( !stream.atEnd() stream.currentToken() != CLOSING(
stream.currentToken()))
{
switch( stream.currentToken())
{
commit ad1a6c6d507f2480efa582ad8b864d65dede1314
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 29 21:06:44 2011 +0100
improve import of docx m:d
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 6d3e4c9..2a29d0a 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -243,9 +243,9 @@ OUString SmOoxmlImport::handleBorderBox()
OUString SmOoxmlImport::handleD()
{
stream.ensureOpeningTag( M_TOKEN( d ));
-sal_Unicode opening = '(';
-sal_Unicode closing = ')';
-sal_Unicode separator = '|';
+OUString opening = STR( ( );
+OUString closing = STR( ) );
+OUString separator = STR( | );
if( XmlStream::Tag dPr = stream.checkOpeningTag( M_TOKEN( dPr )))
{
if( XmlStream::Tag begChr = stream.checkOpeningTag( M_TOKEN( begChr )))
@@ -265,15 +265,40 @@ OUString SmOoxmlImport::handleD()
}
stream.ensureClosingTag( M_TOKEN( dPr ));
}
+if( opening == STR( { ))
+opening = STR( left lbrace );
+if( closing == STR( } ))
+closing = STR( right rbrace );
+if( opening == OUString( sal_Unicode( 0x27e6 )))
+opening = STR( left ldbracket );
+if( closing == OUString( sal_Unicode( 0x27e7 )))
+closing = STR( right rdbracket );
+if( opening == STR( | ))
+
[Libreoffice-commits] .: sc/JunitTest_sc_complex.mk sc/Module_sc.mk sc/qa
sc/JunitTest_sc_complex.mk | 60 +++ sc/Module_sc.mk |1 sc/qa/complex/cellRanges/makefile.mk | 51 - sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk | 46 sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk | 46 sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk | 46 sc/qa/complex/dataPilot/makefile.mk | 59 -- sc/qa/complex/sc/makefile.mk | 51 - 8 files changed, 61 insertions(+), 299 deletions(-) New commits: commit da65218ce1160305e7d60ed6a74f48324f08c83c Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 29 21:48:26 2011 +0100 Enabled sc/qa/complex again. sc/qa/complex/calcPreview/ tests do not work automatically and have been left alone. diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk new file mode 100644 index 000..225c44b --- /dev/null +++ b/sc/JunitTest_sc_complex.mk @@ -0,0 +1,60 @@ +## +## 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. +## +## Major Contributor(s): +## [ Copyright (C) 2011 Stephan Bergmann sberg...@redhat.com (initial +## developer) ] +## +## All Rights Reserved. +## +## For minor contributions see the git repository. +## +## Alternatively, the contents of this file may be used under the terms of +## either the GNU General Public License Version 3 or later (the GPLv3+), or +## the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +## in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +## instead of those above. +## + +$(eval $(call gb_JunitTest_JunitTest,sc_complex,SRCDIR)) + +# sc/qa/complex/calcPreview/ tests do not work autmatically (they request Press +# any key after resizing etc.) + +$(eval $(call gb_JunitTest_add_classes,sc_complex, \ +complex.cellRanges.CheckXCellRangesQuery \ +complex.dataPilot.CheckDataPilot \ +complex.sc.CalcRTL \ +)) + +$(eval $(call gb_JunitTest_add_jars,sc_complex, \ +$(OUTDIR)/bin/OOoRunner.jar \ +$(OUTDIR)/bin/jurt.jar \ +$(OUTDIR)/bin/ridl.jar \ +$(OUTDIR)/bin/test.jar \ +$(OUTDIR)/bin/unoil.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \ +sc/qa/complex/cellRanges/CheckXCellRangesQuery \ +sc/qa/complex/dataPilot/CheckDataPilot \ +sc/qa/complex/dataPilot/_XDataPilotDescriptor \ +sc/qa/complex/dataPilot/_XDataPilotTable \ +sc/qa/complex/dataPilot/_XNamed \ +sc/qa/complex/dataPilot/_XPropertySet \ +sc/qa/complex/sc/CalcRTL \ +)) + +$(eval $(call gb_JunitTest_set_defs,sc_complex, \ +$$(DEFS) \ +)) diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index d7d18dd..0e15220 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_macros_test \ +JunitTest_sc_complex \ JunitTest_sc_unoapi \ )) diff --git a/sc/qa/complex/cellRanges/makefile.mk b/sc/qa/complex/cellRanges/makefile.mk deleted file mode 100755 index a0beb38..000 --- a/sc/qa/complex/cellRanges/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# http://www.openoffice.org/license.html -# for a copy of the LGPLv3 License. -# -#* - -.IF $(OOO_SUBSEQUENT_TESTS)
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - reportdesign/inc reportdesign/source
reportdesign/inc/RptObject.hxx |4 ++
reportdesign/source/core/sdr/RptObject.cxx | 58 ++---
2 files changed, 41 insertions(+), 21 deletions(-)
New commits:
commit a34fee81312413f38f7db3facaac643b2c289d19
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 25 20:16:36 2011 +
Resolves: fdo#39950 fix dnd crash from default assignment operators
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index d58950b..e24d51f 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -224,6 +224,8 @@ public:
virtual OOle2Obj* Clone() const;
virtual void initializeOle();
+OOle2Obj operator=(const OOle2Obj rObj);
+
void initializeChart( const ::com::sun::star::uno::Reference
::com::sun::star::frame::XModel _xModel);
};
@@ -275,6 +277,8 @@ public:
virtual sal_uInt32 GetObjInventor() const;
virtual OUnoObject* Clone() const;
+OUnoObject operator=(const OUnoObject rObj);
+
private:
voidimpl_setReportComponent_nothrow();
voidimpl_initializeModel_nothrow();
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 1f6a01a..80d56cb 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -941,18 +941,24 @@ uno::Reference uno::XInterface
OUnoObject::getUnoShape()
{
return OObjectBase::getUnoShapeOf( *this );
}
-//
-
+
+OUnoObject OUnoObject::operator=(const OUnoObject rObj)
+{
+if( this == rObj )
+return *this;
+SdrUnoObj::operator=(rObj);
+
+ReferenceXPropertySet
xSource(const_castOUnoObject(rObj).getUnoShape(), uno::UNO_QUERY);
+ReferenceXPropertySet xDest(getUnoShape(), uno::UNO_QUERY);
+if ( xSource.is() xDest.is() )
+comphelper::copyProperties(xSource.get(), xDest.get());
+
+return *this;
+}
+
OUnoObject* OUnoObject::Clone() const
{
-OUnoObject* pClone = CloneHelper OUnoObject ();
-if ( pClone )
-{
-ReferenceXPropertySet
xSource(const_castOUnoObject*(this)-getUnoShape(),uno::UNO_QUERY);
-ReferenceXPropertySet xDest(pClone-getUnoShape(),uno::UNO_QUERY);
-if ( xSource.is() xDest.is() )
-comphelper::copyProperties(xSource.get(),xDest.get());
-}
-return pClone;
+return CloneHelper OUnoObject ();
}
//
// OOle2Obj
@@ -1128,22 +1134,32 @@ uno::Reference chart2::data::XDatabaseDataProvider
lcl_getDataProvider(const
}
return xSource;
}
-//
-
-// Clone() soll eine komplette Kopie des Objektes erzeugen.
-OOle2Obj* OOle2Obj::Clone() const
+
+OOle2Obj OOle2Obj::operator=(const OOle2Obj rObj)
{
-OOle2Obj* pObj = CloneHelper OOle2Obj ();
-OReportModel* pRptModel = static_castOReportModel*(GetModel());
-svt::EmbeddedObjectRef::TryRunningState( pObj-GetObjRef() );
-
pObj-impl_createDataProvider_nothrow(pRptModel-getReportDefinition().get());
+if( this == rObj )
+return *this;
+SdrOle2Obj::operator=(rObj);
-uno::Reference chart2::data::XDatabaseDataProvider xSource(
lcl_getDataProvider(GetObjRef()) );
-uno::Reference chart2::data::XDatabaseDataProvider xDest(
lcl_getDataProvider(pObj-GetObjRef()) );
+OReportModel* pRptModel = static_castOReportModel*(rObj.GetModel());
+svt::EmbeddedObjectRef::TryRunningState( GetObjRef() );
+impl_createDataProvider_nothrow(pRptModel-getReportDefinition().get());
+
+uno::Reference chart2::data::XDatabaseDataProvider xSource(
lcl_getDataProvider(rObj.GetObjRef()) );
+uno::Reference chart2::data::XDatabaseDataProvider xDest(
lcl_getDataProvider(GetObjRef()) );
if ( xSource.is() xDest.is() )
comphelper::copyProperties(xSource.get(),xDest.get());
-pObj-initializeChart(pRptModel-getReportDefinition().get());
-return pObj;
+initializeChart(pRptModel-getReportDefinition().get());
+
+return *this;
+}
+
+//
-
+// Clone() soll eine komplette Kopie des Objektes erzeugen.
+OOle2Obj* OOle2Obj::Clone() const
+{
+return CloneHelper OOle2Obj ();
}
//
-
void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference
frame::XModel _xModel)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - bin/distro-install-desktop-integration solenv/gbuild
bin/distro-install-desktop-integration |2 +- solenv/gbuild/extensions/post_AuxTargets.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b7b23ac999393c02ec68f19667960183f512bf43 Author: Rene Engelhard r...@debian.org Date: Tue Nov 29 22:28:58 2011 + don't remove Makefile on make distclean, we need it now in all cases... diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index a08d46e..962f275 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -71,7 +71,7 @@ clean-build: distclean: clean if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi - cd $(SRCDIR) rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \ + cd $(SRCDIR) rm -rf Env.Host.sh aclocal.m4 autogen.lastrun autom4te.cache \ bin/repo-list build_env config.log config.status configure \ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn commit 7f31dfc4b6265b7115f07bc711c969e0e86e5118 Author: Rene Engelhard r...@debian.org Date: Fri Nov 11 16:46:55 2011 + fix test: s/==/=/ diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index f988e12..6e45285 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -66,7 +66,7 @@ add_wrapper() # do we want compat oowrapper? oowrapper_name= -if test $WITH_COMPAT_OOWRAPPERS == 'YES' ; then +if test $WITH_COMPAT_OOWRAPPERS = 'YES' ; then oowrapper_name=`echo $lowrapper_name | sed -e s/^lo/oo/` # oo prefix only for wrappers stating with lo prefix test $oowrapper_name = $lowrapper_name oowrapper_name= ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - extensions/CppunitTest_extensions_test_update.mk extensions/qa extensions/source
extensions/CppunitTest_extensions_test_update.mk | 25 +
extensions/qa/update/simple.xml | 10 ++
extensions/qa/update/test_update.cxx | 94 ++
extensions/source/update/check/updateprotocol.cxx | 27 +-
extensions/source/update/check/updateprotocol.hxx | 14 +++
extensions/source/update/feed/makefile.mk |1
extensions/source/update/feed/updatefeed.cxx | 68 +++
7 files changed, 164 insertions(+), 75 deletions(-)
New commits:
commit cb937da55c3ab3d238b97d6e0e709ea2a04d2c26
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 30 00:11:01 2011 +0100
online update: Now check even the checkForUpdates().
diff --git a/extensions/qa/update/test_update.cxx
b/extensions/qa/update/test_update.cxx
index 57ff71c..84cbc4f 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -128,14 +128,14 @@ protected:
rtl::Reference UpdateCheck aController( UpdateCheck::get() );
if ( checkForUpdates( aInfo, m_xContext,
aController-getInteractionHandler(), m_xProvider,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OS ) ),
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Arch ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
m_aRepositoryList,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( BuildID ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 100 ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID
) ) ) )
{
-//aController-setUpdateInfo( aInfo );
-// TODO check the result
+CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
+CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( http://www.libreoffice.org/download/; ) ) );
}
else
CPPUNIT_FAIL( Calling checkForUpdates() failed. );
commit 358ce1e9c1d85ae7590ecc2b2ddee9db81cf8b84
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Nov 29 22:48:29 2011 +0100
online update: Cleanup after UpdateInformationProvider::load() rewrite.
diff --git a/extensions/source/update/feed/updatefeed.cxx
b/extensions/source/update/feed/updatefeed.cxx
index f5caafc..21bfecf 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -210,15 +210,11 @@ private:
uno::Reference ucb::XCommandProcessor const rxCommandProcessor);
UpdateInformationProvider(const uno::Referenceuno::XComponentContext
xContext,
- const uno::Reference
ucb::XContentIdentifierFactory xContentIdFactory,
- const uno::Reference ucb::XContentProvider
xContentProvider,
const uno::Reference xml::dom::XDocumentBuilder
xDocumentBuilder,
const uno::Reference xml::xpath::XXPathAPI
xXPathAPI);
const uno::Reference uno::XComponentContext m_xContext;
-const uno::Reference ucb::XContentIdentifierFactory m_xContentIdFactory;
-const uno::Reference ucb::XContentProvider m_xContentProvider;
const uno::Reference xml::dom::XDocumentBuilder m_xDocumentBuilder;
const uno::Reference xml::xpath::XXPathAPI m_xXPathAPI;
@@ -331,12 +327,10 @@ private:
UpdateInformationProvider::UpdateInformationProvider(
const uno::Referenceuno::XComponentContext xContext,
-const uno::Reference ucb::XContentIdentifierFactory xContentIdFactory,
-const uno::Reference ucb::XContentProvider xContentProvider,
const uno::Reference xml::dom::XDocumentBuilder xDocumentBuilder,
const uno::Reference xml::xpath::XXPathAPI xXPathAPI
-) : m_xContext(xContext), m_xContentIdFactory(xContentIdFactory),
-m_xContentProvider(xContentProvider), m_xDocumentBuilder(xDocumentBuilder),
+) : m_xContext(xContext),
+m_xDocumentBuilder(xDocumentBuilder),
m_xXPathAPI(xXPathAPI), m_aRequestHeaderList(1)
{
uno::Reference lang::XMultiServiceFactory xConfigurationProvider(
@@ -410,12 +404,6 @@ UpdateInformationProvider::createInstance(const
uno::Referenceuno::XComponentCo
UNISTRING( unable to obtain service manager from component
context ),
uno::Reference uno::XInterface ());
-uno::Reference ucb::XContentIdentifierFactory xContentIdFactory(
-xServiceManager-createInstanceWithContext( UNISTRING(
com.sun.star.ucb.UniversalContentBroker ), xContext ),
-uno::UNO_QUERY_THROW);
-
-uno::Reference ucb::XContentProvider
xContentProvider(xContentIdFactory, uno::UNO_QUERY_THROW);
-
uno::Reference xml::dom::XDocumentBuilder xDocumentBuilder(
xServiceManager-createInstanceWithContext( UNISTRING(
com.sun.star.xml.dom.DocumentBuilder ), xContext ),
[Libreoffice-commits] .: 4 commits - chart2/source sax/qa sax/source sc/source sd/source sfx2/source svl/source svtools/source sw/source tools/inc tools/source vcl/source xmloff/source
chart2/source/view/axes/DateHelper.cxx |6 -
sax/qa/cppunit/test_converter.cxx |9 +-
sax/source/tools/converter.cxx | 19 +++-
sc/source/core/tool/interpr2.cxx |2
sd/source/ui/annotations/annotationmanager.cxx |2
sfx2/source/doc/docfile.cxx|2
sfx2/source/doc/oleprops.cxx |2
svl/source/items/dateitem.cxx |2
svtools/source/contnr/templwin.cxx |2
svtools/source/control/calendar.cxx|8 -
sw/source/core/fields/docufld.cxx |2
sw/source/ui/docvw/SidebarWin.cxx |2
tools/inc/tools/date.hxx |6 +
tools/source/datetime/tdate.cxx| 111 +++--
tools/source/inet/inetmsg.cxx |2
vcl/source/control/field2.cxx |2
xmloff/source/core/xmluconv.cxx| 11 ++
17 files changed, 158 insertions(+), 32 deletions(-)
New commits:
commit 7613359985a89a42417a746bcdbb25f072784733
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:05:25 2011 +0100
handle dates with year 1000
* Read dates with years consisting of less than 4 digits.
ISO 8601 specifies that years are to be written with a minimum of 4
digits.
However, be lenient in what we accept.
* Write years 1000 with leading zeros to comply with ISO 8601 .
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 923c7eb..17d1303 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -215,8 +215,13 @@ void ConverterTest::testDateTime()
doTest( util::DateTime(0, 0, 0, 24, 1, 1, 333)
/*(0, 0, 0, 0, 2, 1, 333)*/,
0333-01-01T24:00:00/*, 0333-01-02T00:00:00*/ );
-doTestDateTimeF( +0001-01-01T00:00:00 ); // invalid: ^+
-doTestDateTimeF( 1-01-01T00:00:00 ); // invalid: 4 Y
+// A leading ^+ is NOT invalid, ISO 8601 specifies this for explicit AD/CE.
+doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
++0001-01-01T00:00:00, 0001-01-01T00:00:00 );
+// While ISO 8601 specifies a minimum of 4 year digits we are lenient in
+// what we accept.
+doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
+1-01-01T00:00:00, 0001-01-01T00:00:00 );
doTestDateTimeF( 0001-1-01T00:00:00 ); // invalid: 2 M
doTestDateTimeF( 0001-01-1T00:00:00 ); // invalid: 2 D
doTestDateTimeF( 0001-01-01T0:00:00 ); // invalid: 2 H
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index b1629c8..0c0779b 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1345,15 +1345,26 @@ bool Converter::convertDateOrDateTime(
const ::rtl::OUString string = rString.trim().toAsciiUpperCase();
sal_Int32 nPos(0);
-if ((string.getLength() nPos) (sal_Unicode('-') == string[nPos]))
+if (string.getLength() nPos)
{
-//Negative Number
-++nPos;
+if (sal_Unicode('-') == string[nPos])
+{
+//Negative Number
+++nPos;
+}
+else if (sal_Unicode('+') == string[nPos])
+{
+//Positive Number, explicit AD/CE
+++nPos;
+}
}
sal_Int32 nYear(0);
{
-bSuccess = readDateTimeComponent(string, nPos, nYear, 4, false);
+// While ISO 8601 specifies years with a minimum of 4 digits, be
+// leninent in what we accept for years 1000. One digit is acceptable
+// if the remainders match.
+bSuccess = readDateTimeComponent(string, nPos, nYear, 1, false);
bSuccess = (0 nYear);
bSuccess = (nPos string.getLength()); // not last token
}
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 5ea85f1..6ceb885 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -436,9 +436,16 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer
rBuffer,
aDate += 1;
}
}
-rBuffer.append( sal_Int32( aDate.GetYear()));
+sal_uInt16 nTemp = aDate.GetYear();
+if (nTemp 1000)
+rBuffer.append( sal_Unicode('0'));
+if (nTemp 100)
+rBuffer.append( sal_Unicode('0'));
+if (nTemp 10)
+rBuffer.append( sal_Unicode('0'));
+rBuffer.append( sal_Int32( nTemp));
rBuffer.append( sal_Unicode('-'));
-sal_uInt16 nTemp = aDate.GetMonth();
+nTemp = aDate.GetMonth();
if (nTemp 10)
rBuffer.append( sal_Unicode('0'));
rBuffer.append( sal_Int32( nTemp));
commit 07a7b2937a9427b2feb3307804ec0f527091bb92
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:05:24 2011 +0100
fixed fdo#40363 freeze chart wizard with non-gregorian date
Use the newly introduced Date::Normalize() instead of a never ending
while(!date.IsValid())
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx|2 +-
binfilter/bf_sfx2/source/doc/timestamp.cxx |2 +-
binfilter/bf_svtools/source/items1/svt_dateitem.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1f9150ab1bbb121c59014fba7c7cd229aceeeb66
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:06:12 2011 +0100
renamed Date::IsValid() to IsValidAndGregorian() to prevent misassumptions
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
index e585be3..edb639f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
@@ -75,7 +75,7 @@ namespace binfilter {
/*N*/ }
/*N*/ Date aDate(1, nM, nY);
/*N*/ aDate += nDay - 1;
-/*N*/ if (aDate.IsValid())
+/*N*/ if (aDate.IsValidAndGregorian())
/*N*/ return (double) (aDate - *(pFormatter-GetNullDate()));
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/doc/timestamp.cxx
b/binfilter/bf_sfx2/source/doc/timestamp.cxx
index 6c42d1e..233ec59 100644
--- a/binfilter/bf_sfx2/source/doc/timestamp.cxx
+++ b/binfilter/bf_sfx2/source/doc/timestamp.cxx
@@ -186,7 +186,7 @@ BOOL TimeStamp::IsValid () const
// The name can have a defaultvalue!
// And its better to safe this result in a local variable ... for better
debug! (to see value)
BOOL bResult = ( m_aModifiedDateTime != TIMESTAMP_INVALID_DATETIME ) ;
-return bResult m_aModifiedDateTime.IsValid();
+return bResult m_aModifiedDateTime.IsValidAndGregorian();
}
diff --git a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
index 61f74b7..38abd6b 100644
--- a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
@@ -137,7 +137,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
) const
{
DBG_CHKTHIS(SfxDateTimeItem, 0);
-if (aDateTime.IsValid())
+if (aDateTime.IsValidAndGregorian())
if (pIntlWrapper)
{
rText = pIntlWrapper-getLocaleData()-getDate(aDateTime);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc
tools/inc/tools/date.hxx | 33 -
1 file changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 2b2f6abfcc83c4701b42c92c6209a1052324f0a5
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:46:55 2011 +0100
introduced Date::IsValidDate() and Date::Normalize()
+ IsValidDate() checks only day and month regarding the year, not Gregorian
cut-off date as now does IsValidAndGregorian().
+ Normalize() carries over invalid day and month values to next months and
years.
* All methods that return or internally use a day count now internally
normalize the date values, without modifying the actual Date instance. So,
if the date is not valid you may get unexpected results.
* Previously, a date with month12 would had accessed the days-of-month
array out of bounds on all such methods. So you would had gotten
unexpected results anyway..
* Affected methods are:
GetDayOfYear()
GetWeekOfYear()
GetDaysInMonth()
static DateToDays()
diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index a9d0e0d..e0cb2a2 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.hxx
@@ -70,22 +70,48 @@ public:
sal_uInt16 GetMonth() const { return (sal_uInt16)((nDate / 100) %
100); }
sal_uInt16 GetYear() const { return (sal_uInt16)(nDate / 1); }
+/// Internally normalizes a copy of values.
DayOfWeek GetDayOfWeek() const;
+
+/// Internally normalizes a copy of values.
sal_uInt16 GetDayOfYear() const;
+
/** nMinimumNumberOfDaysInWeek: how many days of a week must reside in the
-first week of a year. */
+first week of a year.
+Internally normalizes a copy of values. */
sal_uInt16 GetWeekOfYear( DayOfWeek eStartDay = MONDAY,
sal_Int16 nMinimumNumberOfDaysInWeek = 4 )
const;
+/// Internally normalizes a copy of values.
sal_uInt16 GetDaysInMonth() const;
+
sal_uInt16 GetDaysInYear() const { return (IsLeapYear()) ? 366 :
365; }
sal_BoolIsLeapYear() const;
+
/** If the represented date is valid (1=month=12, 1=day=(28,29,30,31)
depending on month/year) AND is of the Gregorian calendar (1582-10-15
= date) (AND implicitly date = -12-31 due to internal
representation) */
sal_BoolIsValidAndGregorian() const;
+/** If the represented date is valid (1=month=12, 1=day=(28,29,30,31)
+depending on month/year) */
+boolIsValidDate() const;
+
+/** Normalize date, invalid day or month values are adapted such that they
+carry over to the next month or/and year, for example 1999-02-32
+becomes 1999-03-04, 1999-13-01 becomes 2000-01-01, 1999-13-42 becomes
+2000-02-11. Truncates at -12-31, -00-x will yield the
+normalized value of -01-max(1,(x-31))
+
+This may be necessary after Date ctors or if the SetDate(), SetDay(),
+SetMonth(), SetYear() methods set individual non-matching values.
+Adding/subtracting to/from dates never produces invalid dates.
+
+@returns TRUE if the date was normalized, i.e. not valid before.
+ */
+boolNormalize();
+
sal_BoolIsBetween( const Date rFrom, const Date rTo ) const
{ return ((nDate = rFrom.nDate)
(nDate = rTo.nDate)); }
@@ -118,7 +144,12 @@ public:
TOOLS_DLLPUBLIC friend Date operator -( const Date rDate, long nDays
);
TOOLS_DLLPUBLIC friend long operator -( const Date rDate1, const
Date rDate2 );
+/// Internally normalizes values.
static long DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
+/// Semantically identical to IsValidDate() member method.
+static bool IsValidDate( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16
nYear );
+/// Semantically identical to Normalize() member method.
+static bool Normalize( sal_uInt16 rDay, sal_uInt16 rMonth, sal_uInt16
rYear );
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binaryurp/qa binaryurp/source bridges/inc bridges/source canvas/source canvas/workben
binaryurp/qa/test-unmarshal.cxx|2 +-
binaryurp/source/bridge.cxx| 10 +-
binaryurp/source/incomingrequest.cxx | 12 ++--
binaryurp/source/proxy.cxx |4 ++--
binaryurp/source/reader.cxx|4 ++--
binaryurp/source/writer.cxx|6 +++---
bridges/inc/bridges/cpp_uno/bridge.hxx |4 ++--
bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp.cxx |2 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |4 ++--
bridges/source/cpp_uno/shared/component.cxx|4 ++--
bridges/source/jni_uno/jni_bridge.cxx | 12 ++--
bridges/source/jni_uno/jni_java2uno.cxx|4 ++--
bridges/source/jni_uno/nativethreadpool.cxx|4 ++--
canvas/source/directx/dx_config.cxx|4 ++--
canvas/source/factory/cf_service.cxx |8
canvas/source/tools/canvastools.cxx|2 +-
canvas/workben/canvasdemo.cxx |2 +-
17 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit 7113c7152d1ec875e65e97548fa6243fc83fbc53
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Nov 30 11:05:16 2011 +0900
catch by constant reference
diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 3e8aac3..aa6c5a9 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -108,7 +108,7 @@ void Test::testTypeOfVoidSequence() {
try {
m.readType();
CPPUNIT_FAIL(exception expected);
-} catch (css::io::IOException ) {}
+} catch (const css::io::IOException ) {}
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 6e97406..b491a2a 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -259,7 +259,7 @@ void Bridge::terminate() {
}
try {
connection_-close();
-} catch (css::io::IOException e) {
+} catch (const css::io::IOException e) {
SAL_INFO(binaryurp, caught IO exception ' e.Message '\'');
}
assert(w.is());
@@ -289,7 +289,7 @@ void Bridge::terminate() {
(*i)-disposing(
css::lang::EventObject(
static_cast cppu::OWeakObject * (this)));
-} catch (css::uno::RuntimeException e) {
+} catch (const css::uno::RuntimeException e) {
SAL_WARN(
binaryurp, caught runtime exception ' e.Message
'\'');
}
@@ -505,10 +505,10 @@ void Bridge::revokeProxy(Proxy proxy) {
void Bridge::freeProxy(Proxy proxy) {
try {
makeReleaseCall(proxy.getOid(), proxy.getType());
-} catch (css::uno::RuntimeException e) {
+} catch (const css::uno::RuntimeException e) {
SAL_INFO(
binaryurp, caught runtime exception ' e.Message '\'');
-} catch (std::exception e) {
+} catch (const std::exception e) {
SAL_WARN(binaryurp, caught C++ exception ' e.what() '\'');
}
bool unused;
@@ -660,7 +660,7 @@ void Bridge::handleCommitChangeReply(
bool ccMode = true;
try {
throwException(exception, returnValue);
-} catch (css::bridge::InvalidProtocolChangeException ) {
+} catch (const css::bridge::InvalidProtocolChangeException ) {
ccMode = false;
}
if (ccMode) {
diff --git a/binaryurp/source/incomingrequest.cxx
b/binaryurp/source/incomingrequest.cxx
index f869c95..431c885 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -87,7 +87,7 @@ void IncomingRequest::execute() const {
try {
try {
isExc = !execute_throw(ret, outArgs);
-} catch (std::exception e) {
+} catch (const std::exception e) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(caught C++ exception: ))
+
@@ -96,7 +96,7 @@ void IncomingRequest::execute() const {
css::uno::Reference css::uno::XInterface ());
// best-effort string conversion
}
-} catch (css::uno::RuntimeException ) {
+} catch (const css::uno::RuntimeException ) {
css::uno::Any exc(cppu::getCaughtException());
ret = bridge_-mapCppToBinaryAny(exc);
isExc = true;
@@ -104,7 +104,7 @@ void IncomingRequest::execute() const {
if (resetCc) {
current_context::set(oldCc);
}
-} catch (css::uno::RuntimeException ) {
+} catch (const css::uno::RuntimeException ) {
css::uno::Any exc(cppu::getCaughtException());
ret = bridge_-mapCppToBinaryAny(exc);
isExc = true;
@@ -115,12 +115,12 @@ void
[Libreoffice-commits] .: sc/source
sc/source/core/data/dociter.cxx|4 +++-
sc/source/core/tool/queryentry.cxx | 16
sc/source/ui/unoobj/cellsuno.cxx |4 +++-
sc/source/ui/unoobj/datauno.cxx| 17 -
4 files changed, 26 insertions(+), 15 deletions(-)
New commits:
commit e4b924df8f9ad02c66549751cb8e123e420e8508
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Nov 30 01:20:45 2011 -0500
Reduce usage of GetQueryItem() (singular version).
I added that as a convenience method while working on implementing
multi-value filtering. But we need to stick with the plural version
GetQueryItems() from now on for clarity.
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index be05630..0b466c0 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -533,7 +533,9 @@
ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat
for (i=0; (inCount) (mpParam-GetEntry(i).bDoQuery); i++)
{
ScQueryEntry rEntry = mpParam-GetEntry(i);
-ScQueryEntry::Item rItem = rEntry.GetQueryItem();
+ScQueryEntry::QueryItemsType rItems = rEntry.GetQueryItems();
+rItems.resize(1);
+ScQueryEntry::Item rItem = rItems.front();
sal_uInt32 nIndex = 0;
bool bNumber = mpDoc-GetFormatTable()-IsNumberFormat(
rItem.maString, nIndex, rItem.mfVal);
diff --git a/sc/source/core/tool/queryentry.cxx
b/sc/source/core/tool/queryentry.cxx
index be107e7..1f9be97 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -101,7 +101,8 @@ const ScQueryEntry::QueryItemsType
ScQueryEntry::GetQueryItems() const
void ScQueryEntry::SetQueryByEmpty()
{
eOp = SC_EQUAL;
-Item rItem = GetQueryItem();
+maQueryItems.resize(1);
+Item rItem = maQueryItems[0];
rItem.meType = ByEmpty;
rItem.maString = rtl::OUString();
rItem.mfVal = SC_EMPTYFIELDS;
@@ -109,11 +110,10 @@ void ScQueryEntry::SetQueryByEmpty()
bool ScQueryEntry::IsQueryByEmpty() const
{
-if (maQueryItems.size() 1)
-// multi-item query.
+if (maQueryItems.size() != 1)
return false;
-const Item rItem = GetQueryItem();
+const Item rItem = maQueryItems[0];
return eOp == SC_EQUAL
rItem.meType == ByEmpty
rItem.maString.isEmpty()
@@ -123,7 +123,8 @@ bool ScQueryEntry::IsQueryByEmpty() const
void ScQueryEntry::SetQueryByNonEmpty()
{
eOp = SC_EQUAL;
-Item rItem = GetQueryItem();
+maQueryItems.resize(1);
+Item rItem = maQueryItems[0];
rItem.meType = ByEmpty;
rItem.maString = rtl::OUString();
rItem.mfVal = SC_NONEMPTYFIELDS;
@@ -131,11 +132,10 @@ void ScQueryEntry::SetQueryByNonEmpty()
bool ScQueryEntry::IsQueryByNonEmpty() const
{
-if (maQueryItems.size() 1)
-// multi-item query.
+if (maQueryItems.size() != 1)
return false;
-const Item rItem = GetQueryItem();
+const Item rItem = maQueryItems[0];
return eOp == SC_EQUAL
rItem.meType == ByEmpty
rItem.maString.isEmpty()
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index e26ae90..6be0239 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5683,7 +5683,9 @@ void SAL_CALL ScCellRangeObj::filter( const
uno::Referencesheet::XSheetFilterDe
{
rEntry.nField += nFieldStart;
// Im Dialog wird immer der String angezeigt - muss zum Wert
passen
-ScQueryEntry::Item rItem = rEntry.GetQueryItem();
+ScQueryEntry::QueryItemsType rItems = rEntry.GetQueryItems();
+rItems.resize(1);
+ScQueryEntry::Item rItem = rItems.front();
if (rItem.meType != ScQueryEntry::ByString)
{
pDocSh-GetDocument()-GetFormatTable()-
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 960ac08..3695f14 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1105,7 +1105,10 @@ uno::Sequencesheet::TableFilterField SAL_CALL
ScFilterDescriptorBase::getFilte
for (SCSIZE i=0; inCount; i++)
{
const ScQueryEntry rEntry = aParam.GetEntry(i);
-const ScQueryEntry::Item rItem = rEntry.GetQueryItem();
+if (rEntry.GetQueryItems().empty())
+continue;
+
+const ScQueryEntry::Item rItem = rEntry.GetQueryItems().front();
aField.Connection= (rEntry.eConnect == SC_AND) ?
sheet::FilterConnection_AND :
sheet::FilterConnection_OR;
@@ -1233,7 +1236,9 @@ void fillQueryParam(
if (pAry[i].Operator != sheet::FilterOperator2::EMPTY
pAry[i].Operator != sheet::FilterOperator2::NOT_EMPTY)
{
-ScQueryEntry::Item rItem = rEntry.GetQueryItem();
+
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/bastypes.cxx |4 ++--
basctl/source/inc/sbxitem.hxx | 24 +++-
2 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit e007d3f3b93235be8dfd328db6cf38475acb49a7
Author: August Sodora aug...@gmail.com
Date: Wed Nov 30 01:41:45 2011 -0500
String-OUString
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 91d2576..4dcc710 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -886,7 +886,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey rKey )
return pItem;
}
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const
String aLibName, const String aName, sal_uInt16 nType )
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const
::rtl::OUString aLibName, const ::rtl::OUString aName, sal_uInt16 nType )
:SfxPoolItem( nWhich_ )
,m_aDocument(rDocument)
,m_aLibName(aLibName)
@@ -895,7 +895,7 @@ SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument
rDocument, const Stri
{
}
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const
String aLibName, const String aName, const String aMethodName, sal_uInt16
nType )
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const
::rtl::OUString aLibName, const ::rtl::OUString aName, const ::rtl::OUString
aMethodName, sal_uInt16 nType )
:SfxPoolItem( nWhich_ )
,m_aDocument(rDocument)
,m_aLibName(aLibName)
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index d1efe51..94a8b51 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -38,19 +38,18 @@ const sal_uInt16 BASICIDE_TYPE_MODULE = 3;
const sal_uInt16 BASICIDE_TYPE_DIALOG = 4;
const sal_uInt16 BASICIDE_TYPE_METHOD = 5;
-
class SbxItem : public SfxPoolItem
{
ScriptDocument m_aDocument;
-String m_aLibName;
-String m_aName;
-String m_aMethodName;
+::rtl::OUString m_aLibName;
+::rtl::OUString m_aName;
+::rtl::OUString m_aMethodName;
sal_uInt16 m_nType;
public:
TYPEINFO();
-SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const String
aLibName, const String aName, sal_uInt16 nType );
-SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const String
aLibName, const String aName, const String aMethodName, sal_uInt16 nType );
+SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const
::rtl::OUString aLibName, const ::rtl::OUString aName, sal_uInt16 nType );
+SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const
::rtl::OUString aLibName, const ::rtl::OUString aName, const ::rtl::OUString
aMethodName, sal_uInt16 nType );
SbxItem( const SbxItem );
virtual SfxPoolItem*Clone( SfxItemPool *pPool = 0 ) const;
@@ -60,20 +59,19 @@ public:
GetDocument() const { return m_aDocument; }
voidSetDocument( const ScriptDocument rDocument ) {
m_aDocument = rDocument; }
-const String GetLibName() const { return m_aLibName; }
-voidSetLibName( const String aLibName ) { m_aLibName
= aLibName; }
+const ::rtl::OUString GetLibName() const { return m_aLibName; }
+voidSetLibName( const ::rtl::OUString aLibName ) {
m_aLibName = aLibName; }
-const String GetName() const { return m_aName; }
-voidSetName( const String aName ) { m_aName = aName; }
+const ::rtl::OUString GetName() const { return m_aName; }
+voidSetName( const ::rtl::OUString aName ) { m_aName
= aName; }
-const String GetMethodName() const { return m_aMethodName; }
-voidSetMethodName( const String aMethodName ) {
m_aMethodName = aMethodName; }
+const ::rtl::OUString GetMethodName() const { return m_aMethodName; }
+voidSetMethodName( const ::rtl::OUString aMethodName
) { m_aMethodName = aMethodName; }
sal_uInt16 GetType() const { return m_nType; }
voidSetType( sal_uInt16 nType ) { m_nType = nType; }
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e57e5b0c7f1a5ec6cd008226f126438d65cbd8d0 Author: Kalman Szalai - KAMI kami...@gmail.com Date: Wed Nov 30 06:58:15 2011 +0100 Use SmART Gallery 0.95 diff --git a/configure.in b/configure.in index b9b3577..4c11c91 100644 --- a/configure.in +++ b/configure.in @@ -8118,7 +8118,7 @@ AC_MSG_CHECKING([for SmART Gallery (Diagram) extension integration]) DIAGRAM_EXTENSION_PACK= if test x$enable_ext_diagram = xyes -a x$enable_extension_integration != xno; then SCPDEFS=$SCPDEFS -DWITH_EXTENSION_DIAGRAM -DIAGRAM_EXTENSION_PACK=4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt +DIAGRAM_EXTENSION_PACK=8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx | 20 ++--
basctl/source/basicide/basidesh.cxx |6 +++---
basctl/source/basicide/basobj2.cxx |2 +-
basctl/source/basicide/basobj3.cxx |2 +-
basctl/source/basicide/bastype2.hxx |2 +-
basctl/source/basicide/bastype3.cxx | 14 +++---
basctl/source/basicide/bastypes.cxx |4 ++--
basctl/source/basicide/moduldl2.cxx |2 +-
basctl/source/basicide/moduldlg.cxx |4 ++--
basctl/source/inc/basidesh.hxx |2 +-
basctl/source/inc/sbxitem.hxx | 25 ++---
11 files changed, 43 insertions(+), 40 deletions(-)
New commits:
commit 1eb974c1429967ce76db4b16192a9a95b3e8cc6f
Author: August Sodora aug...@gmail.com
Date: Wed Nov 30 02:11:15 2011 -0500
Convert group of consts to enum
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 8d184e2..2aff96e 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -615,9 +615,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
String aName( rSbxItem.GetName() );
if ( !m_aCurLibName.Len() || ( aDocument == m_aCurDocument
aLibName == m_aCurLibName ) )
{
-if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
+if ( rSbxItem.GetType() == BasicIDEType::Module )
FindBasWin( aDocument, aLibName, aName, sal_True );
-else if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
+else if ( rSbxItem.GetType() == BasicIDEType::Dialog )
FindDlgWin( aDocument, aLibName, aName, sal_True );
}
}
@@ -641,15 +641,15 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
String aName( rSbxItem.GetName() );
SetCurLib( aDocument, aLibName );
IDEBaseWindow* pWin = 0;
-if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
+if ( rSbxItem.GetType() == BasicIDEType::Dialog )
{
pWin = FindDlgWin( aDocument, aLibName, aName, sal_True );
}
-else if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
+else if ( rSbxItem.GetType() == BasicIDEType::Module )
{
pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
}
-else if ( rSbxItem.GetType() == BASICIDE_TYPE_METHOD )
+else if ( rSbxItem.GetType() == BasicIDEType::Method )
{
pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
((ModulWindow*)pWin)-EditMacro( rSbxItem.GetMethodName() );
@@ -1137,7 +1137,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin,
sal_Bool bUpdateTabBar
BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
if ( pData )
{
-sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow
) ) ? BASICIDE_TYPE_MODULE : BASICIDE_TYPE_DIALOG;
+sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow
) ) ? BasicIDEType::Module : BasicIDEType::Dialog;
LibInfoItem* pLibInfoItem = new LibInfoItem(
pCurWin-GetDocument(), pCurWin-GetLibName(), pCurWin-GetName(), nCurrentType
);
pData-GetLibInfos().InsertInfo( pLibInfoItem );
}
@@ -1240,21 +1240,21 @@ IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
return FindWindow( ScriptDocument::getApplicationScriptDocument() );
}
-IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument rDocument,
const String rLibName, const String rName, sal_uInt16 nType, sal_Bool
bFindSuspended )
+IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument rDocument,
const String rLibName, const String rName, BasicIDEType nType, sal_Bool
bFindSuspended )
{
IDEBaseWindow* pWin = aIDEWindowTable.First();
while ( pWin )
{
if ( !pWin-IsSuspended() || bFindSuspended )
{
-if ( !rLibName.Len() || !rName.Len() || nType ==
BASICIDE_TYPE_UNKNOWN )
+if ( !rLibName.Len() || !rName.Len() || nType ==
BasicIDEType::Unknown )
{
// return any non-suspended window
return pWin;
}
else if ( pWin-IsDocument( rDocument ) pWin-GetLibName() ==
rLibName pWin-GetName() == rName
- ( ( pWin-IsA( TYPE( ModulWindow ) ) nType ==
BASICIDE_TYPE_MODULE ) ||
-( pWin-IsA( TYPE( DialogWindow ) ) nType ==
BASICIDE_TYPE_DIALOG ) ) )
+ ( ( pWin-IsA( TYPE( ModulWindow ) ) nType ==
BasicIDEType::Module ) ||
+( pWin-IsA( TYPE( DialogWindow ) ) nType ==
BasicIDEType::Dialog ) ) )
{
return pWin;
}
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index
