[Libreoffice-commits] Changes to 'go-oo'
New branch 'go-oo' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'go-oo' - 3 commits - about/index.html about/index.php developers/index.html developers/index.php developers/mailarchive download/index.html download/index.php include.
Makefile | 23 --- about/index.html | 71 --- about/index.php | 42 -- developers/index.html | 239 +- developers/index.php | 204 developers/mailarchive/index.html |9 - download/index.html | 12 + download/index.php|3 include.mk|4 index.html| 61 - index.php | 27 ++-- mgp-users.html|6 template.php | 24 +-- users/faq/index.html | 92 -- users/index.html | 54 users/index.php | 16 -- users/mgp/index.html | 115 -- users/mgp/index.php | 79 18 files changed, 78 insertions(+), 1003 deletions(-) New commits: commit bb3751b88b4af3f0897e180f3beff5f180fc710b Author: Michael Meeks michael.me...@suse.com Date: Tue May 1 16:12:17 2012 +0100 highlight go-oo obsoletion on the front page and fix links diff --git a/developers/mailarchive/index.html b/developers/mailarchive/index.html index 3ea6189..b996dbc 100644 --- a/developers/mailarchive/index.html +++ b/developers/mailarchive/index.html @@ -23,7 +23,7 @@ li class=tabs-selecteda href=http://www.libreoffice.org/developers/;Developers/a/li /ul div id=tagline -a href=http://www.go-oo.org;Better, Faster, Free-er/a +a href=http://www.libreoffice.org;LibreOffice is now Better, Faster, Free-er/a /div div class=container diff --git a/index.html b/index.html index 96f76af..9748629 100644 --- a/index.html +++ b/index.html @@ -23,17 +23,29 @@ li class=tabs-containera href=http://www.libreoffice.org/developers/;Developers/a/li /ul div id=tagline -a href=http://www.go-oo.org;Better, Faster, Free-er/a +a href=http://www.libreoffice.org;LibreOffice is now Better, Faster, Free-er/a /div div class=container div id=splash h2Your Office Suite/h2 +h1Go-oo is obsoleted by LibreOffice/h1 +div style=width: 20%; float: right;pa href=http://documentfoundation.org;img src=img/libreoffice-logo.png/a/p/div +div style=width: 70%; float: left; +p + The creation of a href=http://documentfoundation.org;The Document + Foundation's/a has provided the ideal home for the go-oo developers. + The go-oo project has been dis-continued in favour of a + href=http://www.libreoffice.org;LibreOffice - the new home of the + open office suite/a. +/p +/div +hr/ div id=download - a href=/download/ + a href=http://www.libreoffice.org/download/; img id=home_oo_image src=img/thumb_go-oox-pptx.png /br / - a href=/download/Download/a + a href=http://www.libreoffice.org/download/;Download/a /div h3Better interoperability/h3 p @@ -115,17 +127,6 @@ that's really excellent, but this is not our focus: there are no formal roles in development to reflect this valuable work. /p - -h3Go-oo joins forces with LibreOffice/h3 -div style=width: 70%; float: left; -p - Go-oo shares much of its goals and philosophy with a href=http://documentfoundation.org;The Document -Foundation's/a LibreOffice project, we're therefore supporting LibreOffice since it's inception, and are -in the process of merging most of our patches over, as well as migrating to Document Foundation infrastructure. -Going forward, the Go-oo project will be discontinued in favor of LibreOffice. -/p -/div -div style=width: 20%; float: right;pa href=http://documentfoundation.org;img src=img/libreoffice-logo.png/a/p/div /div /div diff --git a/index.php b/index.php index 828a696..d29c9b4 100644 --- a/index.php +++ b/index.php @@ -3,10 +3,22 @@ require(template.php); $content = EOT +h1Go-oo is obsoleted by LibreOffice/h1 +div style=width: 20%; float: right;pa href=http://documentfoundation.org;img src=img/libreoffice-logo.png/a/p/div +div style=width: 70%; float: left; +p + The creation of a href=http://documentfoundation.org;The Document + Foundation's/a has provided the ideal home for the go-oo developers. + The go-oo project has been dis-continued in favour of a + href=http://www.libreoffice.org;LibreOffice - the new home of the + open office suite/a. +/p +/div +hr/ div id=download - a href=/download/ + a href
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx
vcl/unx/generic/app/salinst.cxx |3 --
vcl/unx/gtk/app/gtkinst.cxx | 54 +++-
2 files changed, 43 insertions(+), 14 deletions(-)
New commits:
commit 8ceb098374284d4ab78a6e6e649b0674dcae40d4
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 24 12:03:27 2012 +0100
Resolves: fdo#48011 writer idle-callbacks are halting when events pending
Writer does a lot of work, e.g. spell-checking, word counting etc. in
idle-callbacks. It halts work by checking for AnyInput, and if any input or
paint etc is pending the idle-callbacks stop. With gtk3 rework pending
events don't seem to be available quite right.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 33e4ede..64e29e5 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -148,9 +148,8 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
Display *pDisplay = pData-GetSalDisplay()-GetDisplay();
sal_Bool bRet = sal_False;
-if( (nType VCL_INPUT_TIMER) mpXLib-CheckTimeout( false ) )
+if( (nType VCL_INPUT_TIMER) (mpXLib mpXLib-CheckTimeout(false)) )
bRet = sal_True;
-
else if (XPending(pDisplay) )
{
PredicateReturn aInput;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index b6eacc9..f409bfa 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -27,6 +27,7 @@
/
+#include stack
#include string.h
#include osl/module.h
#include unx/gtk/gtkdata.hxx
@@ -263,12 +264,11 @@ extern C {
return GDK_FILTER_CONTINUE;
}
-// And then again as they pop out of gdk and into gtk+
-
-static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+static sal_uInt16 categorizeEvent(const GdkEvent *pEvent)
{
sal_uInt16 nType = 0;
-switch( pEvent-type ) {
+switch( pEvent-type )
+{
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
@@ -290,8 +290,16 @@ extern C {
nType = VCL_INPUT_OTHER;
break;
}
-((GtkInstance *)data)-subtractEvent( nType );
+return nType;
+}
+
+// And then again as they pop out of gdk and into gtk+
+
+static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+{
+sal_uInt16 nType = categorizeEvent(pEvent);
+((GtkInstance *)data)-subtractEvent( nType );
gtk_main_do_event( pEvent );
}
}
@@ -622,16 +630,38 @@ bool GtkInstance::AnyInput( sal_uInt16 nType )
{
if( (nType VCL_INPUT_TIMER) IsTimerExpired() )
return true;
-else
+#if !GTK_CHECK_VERSION(3,0,0)
+bool bRet = X11SalInstance::AnyInput(nType);
+#else
+if (!gdk_events_pending())
+return false;
+
+if (nType == VCL_INPUT_ANY)
+return true;
+
+bool bRet = false;
+std::stackGdkEvent* aEvents;
+GdkEvent *pEvent = NULL;
+while ((pEvent = gdk_event_get()))
{
-bool bRet = false;
-sal_uInt16 nShift = 1;
-for (int i = 0; i 16; i++) {
-bRet |= (nType nShift) m_nAnyInput[i] 0;
-nShift = 1;
+aEvents.push(pEvent);
+sal_uInt16 nEventType = categorizeEvent(pEvent);
+if ( (nEventType nType) || ( ! nEventType (nType
VCL_INPUT_OTHER) ) )
+{
+bRet = true;
+break;
}
-return bRet;
}
+
+while (!aEvents.empty())
+{
+pEvent = aEvents.top();
+gdk_event_put(pEvent);
+gdk_event_free(pEvent);
+aEvents.pop();
+}
+#endif
+return bRet;
}
GenPspGraphics *GtkInstance::CreatePrintGraphics()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_services.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit b0547b358b2262a7f75b932ba37f35155a5c2406
Author: Michael Meeks michael.me...@suse.com
Date: Mon Apr 23 16:58:59 2012 +0100
bomb out compilation of cairo canvas for mac or windows
This is to avoid unintended regressions based on configure options.
diff --git a/canvas/source/cairo/cairo_services.cxx
b/canvas/source/cairo/cairo_services.cxx
index dfb694f..f9ca5d6 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -46,6 +46,10 @@
using namespace ::com::sun::star;
+#if defined(WNT) || defined (MACOSX)
+# error The cairo canvas should not be enabled on Windows or Mac cf
fdo#46901
+#endif
+
namespace cairocanvas
{
static uno::Referenceuno::XInterface initCanvas( Canvas* pCanvas )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 6d97ea37bba52b21648c91276bc9281d06cdd148
Author: Michael Meeks michael.me...@suse.com
Date: Thu Apr 19 14:34:35 2012 +0100
fdo#46687 - fix find toolbar X error handling
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4137a8d..a647bf8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2231,6 +2231,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
// to do this we need to synchronize with the XServer
GetGenericData()-ErrorTrapPush();
XSetInputFocus( getDisplay()-GetDisplay(),
widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
+// fdo#46687 - an XSync should not be necessary - but for some
reason it is.
+XSync( getDisplay()-GetDisplay(), False );
GetGenericData()-ErrorTrapPop();
}
#endif
@@ -3239,9 +3241,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget,
GdkEvent*, gpointer frame )
#if !GTK_CHECK_VERSION(3,0,0)
if( bSetFocus )
{
+GetGenericData()-ErrorTrapPush();
XSetInputFocus( pThis-getDisplay()-GetDisplay(),
widget_get_xid(pWidget),
RevertToParent, CurrentTime );
+GetGenericData()-ErrorTrapPop();
}
#else
(void)pWidget; (void)bSetFocus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - shell/source TEMPLATE.SOURCECODE.HEADER
TEMPLATE.SOURCECODE.HEADER | 30 ++---
shell/source/backends/gconfbe/gconfbackend.cxx |4 --
shell/source/backends/gconfbe/makefile.mk |2 -
shell/source/backends/gconfbe/orbit.h | 42 -
4 files changed, 6 insertions(+), 72 deletions(-)
New commits:
commit e40e42ffeaa56c2f66b71c58190774cc70d20343
Author: Michael Meeks michael.me...@suse.com
Date: Thu Apr 19 15:01:03 2012 +0100
update header template to MPLv2 cf. ESC minutes.
diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
index cae6935..1d7331c 100644
--- a/TEMPLATE.SOURCECODE.HEADER
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -1,32 +1,10 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ * Copyright 2012 LibreOffice contributors.
*
- * 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) 2012 Jim Bob j...@bob.org (initial developer) ]
- * [ Copyright (C) 2012 Ted t...@bear.com ]
-
- *
- * 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.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
...
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a219edfbb65e6623dde2d52c41547d78346b7144
Author: Ross Burton ross.bur...@intel.com
Date: Wed Apr 18 21:26:38 2012 +0100
Don't check for ORBit 2.8
ORBit 2.8 was released in 2003 so let's assume that this isn't being used.
Also
the assumption is that it's coming in through GConf, which isn't true with
GConf
3 onwards, released July 2011.
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx
b/shell/source/backends/gconfbe/gconfbackend.cxx
index 57a1a4e..82ea9fe 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -61,7 +61,6 @@
#include uno/lbnames.h
#include gconfaccess.hxx
-#include orbit.h
namespace {
@@ -165,8 +164,7 @@ Service::Service(): enabled_(false) {
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(system.desktop-environment))) =
desktop;
-enabled_ = desktop == GNOME ((orbit_major_version == 2
orbit_minor_version = 8) || orbit_major_version 2);
-// ORBit-2 versions 2.8 cause a deadlock with the gtk+ VCL plugin
+enabled_ = desktop == GNOME;
}
}
diff --git a/shell/source/backends/gconfbe/makefile.mk
b/shell/source/backends/gconfbe/makefile.mk
index 9e77a08..84ec3db 100644
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS+=-DENABLE_LOCKDOWN
.IF $(ENABLE_GCONF)!=
COMPILER_WARN_ALL=TRUE
-PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
+PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0
.INCLUDE: pkg_config.mk
.IF $(OS) == SOLARIS
diff --git a/shell/source/backends/gconfbe/orbit.h
b/shell/source/backends/gconfbe/orbit.h
deleted file mode 100644
index 82673a3..000
--- a/shell/source/backends/gconfbe/orbit.h
+++ /dev/null
@@ -1,42 +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
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb5c881a7f179391ee853f76e159254c97d776a3
Author: Michael Meeks michael.me...@suse.com
Date: Wed Apr 18 11:04:08 2012 +0100
avoid using the new rdb reading logic for empty/non-existent directories
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index cc64e07..fad335b 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -333,7 +333,7 @@ Reference registry::XSimpleRegistry readRdbDirectory(
}
nXML++;
}
-if (nXML == aURLs.size())
+if (nXML 0 nXML == aURLs.size())
{
OSL_TRACE (OSL_LOG_PREFIX no legacy rdbs in directory '%s'\n,
rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8
).getStr());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ed7df6ba854a799e8e9fb92c68650cc5e6e5695
Author: Michael Meeks michael.me...@suse.com
Date: Wed Apr 18 11:04:08 2012 +0100
avoid using the new rdb reading logic for empty/non-existent directories
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 7ead585..cd0313e 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -322,7 +322,7 @@ Reference registry::XSimpleRegistry readRdbDirectory(
}
nXML++;
}
-if (nXML == aURLs.size())
+if (nXML 0 nXML == aURLs.size())
{
OSL_TRACE (OSL_LOG_PREFIX no legacy rdbs in directory '%s'\n,
rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8
).getStr());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/appoptio.hxx |5 -
sc/inc/scmod.hxx|2 +-
sc/source/core/tool/appoptio.cxx|4
sc/source/ui/vba/vbaapplication.cxx | 10 +-
sc/source/ui/view/tabvwsh4.cxx | 11 +--
5 files changed, 7 insertions(+), 25 deletions(-)
New commits:
commit 27dda3134748cd0a549b75db830496539959eb90
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Tue Apr 17 20:25:53 2012 +0200
Removed duplicate set/get methods for initial tab count
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index b7f5fe8..d4cc424 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -46,10 +46,6 @@ public:
voidSetDefaults();
-// Set or get the initial tab count for new spreadsheet, it is used by VBA
API currently.
-voidSetTabCountInNewSpreadsheet( SCTAB nCount ) {
nTabCountInNewSpreadsheet = nCount; }
-SCTAB GetTabCountInNewSpreadsheet() const { return
nTabCountInNewSpreadsheet; }
-
voidSetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; }
FieldUnit GetAppMetric() const{ return eMetric; }
voidSetZoom( sal_uInt16 nNew ) { nZoom = nNew; }
@@ -94,7 +90,6 @@ public:
const ScAppOptions operator= ( const ScAppOptions rOpt );
private:
-SCTAB nTabCountInNewSpreadsheet;
FieldUnit eMetric;
sal_uInt16 nLRUFuncCount;
sal_uInt16* pLRUList;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 4c36f30..69bc665 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -182,7 +182,7 @@ public:
const ScViewOptionsGetViewOptions ();
SC_DLLPUBLICconst ScDocOptions GetDocOptions ();
SC_DLLPUBLICconst ScAppOptions GetAppOptions ();
-const ScDefaultsOptions GetDefaultsOptions ();
+SC_DLLPUBLICconst ScDefaultsOptions GetDefaultsOptions ();
const ScFormulaOptions GetFormulaOptions ();
const ScInputOptions GetInputOptions ();
SC_DLLPUBLICconst ScPrintOptions GetPrintOptions ();
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 9b352b8..b864804 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -78,9 +78,6 @@ ScAppOptions::~ScAppOptions()
void ScAppOptions::SetDefaults()
{
-// Set default tab count for new spreadsheet.
-nTabCountInNewSpreadsheet = 0;
-
if ( ScOptionsUtil::IsMetricSystem() )
eMetric = FUNIT_CM; // default for countries with
metric system
else
@@ -118,7 +115,6 @@ void ScAppOptions::SetDefaults()
const ScAppOptions ScAppOptions::operator=( const ScAppOptions rCpy )
{
-nTabCountInNewSpreadsheet = rCpy.nTabCountInNewSpreadsheet;
eMetric = rCpy.eMetric;
eZoomType = rCpy.eZoomType;
bSynchronizeZoom = rCpy.bSynchronizeZoom;
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index d0201a4..478e8f4 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -79,7 +79,7 @@
#include global.hxx
#include scmod.hxx
#include docoptio.hxx
-#include appoptio.hxx
+#include defaultsoptions.hxx
#include osl/file.hxx
#include rtl/instance.hxx
@@ -939,8 +939,8 @@ ScVbaApplication::setEnableCancelKey(sal_Int32
/*lEnableCancelKey*/) throw (uno:
sal_Int32 SAL_CALL ScVbaApplication::getSheetsInNewWorkbook() throw
(uno::RuntimeException)
{
-const ScAppOptions rAppOpt = SC_MOD()-GetAppOptions();
-return rAppOpt.GetTabCountInNewSpreadsheet();
+const ScDefaultsOptions rOpt = SC_MOD()-GetDefaultsOptions();
+return rOpt.GetInitTabCount();
}
void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook( sal_Int32
SheetsInNewWorkbook ) throw (script::BasicErrorException, uno::RuntimeException)
@@ -952,8 +952,8 @@ void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook(
sal_Int32 SheetsInNewWor
}
else
{
-ScAppOptions rAppOpt = const_cast ScAppOptions
(SC_MOD()-GetAppOptions());
-rAppOpt.SetTabCountInNewSpreadsheet( SheetsInNewWorkbook );
+ScDefaultsOptions rOpt = const_cast ScDefaultsOptions
(SC_MOD()-GetDefaultsOptions());
+rOpt.SetInitTabCount( SheetsInNewWorkbook );
}
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4cf2624..238d124 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1605,19 +1605,10 @@ void ScTabViewShell::Construct( sal_uInt8
nForceDesignMode )
// append additional sheets (not for OLE object)
if ( pDocSh-GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
{
-// Get the customized initial tab count...
-
-// ... from option dialog.
+// Get the customized initial tab count
const ScDefaultsOptions rOpt = SC_MOD()-GetDefaultsOptions();
[Libreoffice-commits] .: icon-themes/galaxy
dev/null |binary 1 file changed New commits: commit 212c18430864f110e5a3549c0279b1a2ea4bb6bd Author: Michael Meeks michael.me...@suse.com Date: Tue Apr 17 10:45:20 2012 +0100 remove redundant artwork diff --git a/icon-themes/galaxy/sfx2/res/an01.png b/icon-themes/galaxy/sfx2/res/an01.png deleted file mode 100644 index b9dfc05..000 Binary files a/icon-themes/galaxy/sfx2/res/an01.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an02.png b/icon-themes/galaxy/sfx2/res/an02.png deleted file mode 100644 index 752ec39..000 Binary files a/icon-themes/galaxy/sfx2/res/an02.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an03.png b/icon-themes/galaxy/sfx2/res/an03.png deleted file mode 100644 index ce195e5..000 Binary files a/icon-themes/galaxy/sfx2/res/an03.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an04.png b/icon-themes/galaxy/sfx2/res/an04.png deleted file mode 100644 index 8c0de0f..000 Binary files a/icon-themes/galaxy/sfx2/res/an04.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an05.png b/icon-themes/galaxy/sfx2/res/an05.png deleted file mode 100644 index b61b012..000 Binary files a/icon-themes/galaxy/sfx2/res/an05.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/an06.png b/icon-themes/galaxy/sfx2/res/an06.png deleted file mode 100644 index b72d8ba..000 Binary files a/icon-themes/galaxy/sfx2/res/an06.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/lco.png b/icon-themes/galaxy/sfx2/res/lco.png deleted file mode 100644 index bafbc47..000 Binary files a/icon-themes/galaxy/sfx2/res/lco.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/lmo.png b/icon-themes/galaxy/sfx2/res/lmo.png deleted file mode 100644 index 134b88e..000 Binary files a/icon-themes/galaxy/sfx2/res/lmo.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/sco.png b/icon-themes/galaxy/sfx2/res/sco.png deleted file mode 100644 index 248b89e..000 Binary files a/icon-themes/galaxy/sfx2/res/sco.png and /dev/null differ diff --git a/icon-themes/galaxy/sfx2/res/smo.png b/icon-themes/galaxy/sfx2/res/smo.png deleted file mode 100644 index bd56c02..000 Binary files a/icon-themes/galaxy/sfx2/res/smo.png and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/inc/rootfrm.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit edcf5270f0a4d6ef59fe914e41e25df494ceca54 Author: Michael Meeks michael.me...@suse.com Date: Sun Apr 15 18:45:59 2012 +0200 remove extraneous '2' diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index dc62618..85c2a07 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -114,7 +114,6 @@ class SwRootFrm: public SwLayoutFrm //Die letzte Seite wollen wir uns nicht immer muehsam zusammensuchen. SwPageFrm *pLastPage; -2 // [ Comment from the original StarOffice checkin ]: // The root takes care of the shell access. Via the document // it should be possible to get at the root frame, and thus always ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 34 ++
1 file changed, 24 insertions(+), 10 deletions(-)
New commits:
commit 2a20f94696addc362ba62d1cced1793c08e26e75
Author: Michael Meeks michael.me...@suse.com
Date: Sat Apr 14 13:39:52 2012 +0200
gtk3: add approved theme color fetch / selection.
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6bfad00..aaa4bd7 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1166,12 +1166,17 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
aStyleSet.SetButtonRolloverTextColor( aTextColor );
aStyleSet.SetFieldRolloverTextColor( aTextColor );
-#if 0
-// Tooltip colors
-GtkStyle* pTooltipStyle = gtk_widget_get_style(
gWidgetData[m_nScreen].gTooltipPopup );
-aTextColor = getColor( pTooltipStyle-fg[ GTK_STATE_NORMAL ] );
-aStyleSet.SetHelpTextColor( aTextColor );
-#endif
+// FIXME: each gtk3 theme needs to define a set of well-known
+// color names for LibreOffice eg.
+// @define-color tooltip_bg_color #343434;
+GdkRGBA tooltip_bg_color;
+if( gtk_style_context_lookup_color( pStyle, tooltip_bg_color,
tooltip_bg_color ) )
+{
+aStyleSet.SetHelpTextColor( getColor( tooltip_bg_color ) );
+fprintf (stderr, Set tooltip bg color %g %g %g %g\n,
+ tooltip_bg_color.red, tooltip_bg_color.green,
+ tooltip_bg_color.blue, tooltip_bg_color.alpha );
+}
// background colors
GdkRGBA background_color;
@@ -1184,15 +1189,24 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
aStyleSet.SetWorkspaceColor( aBackColor );
aStyleSet.SetCheckedColorSpecialCase( );
+{ // FIXME: turn me into a helper function ...
+// construct style context for text view
+GtkStyleContext *pCStyle = gtk_style_context_new();
+gtk_style_context_set_screen( pCStyle, gtk_window_get_screen( GTK_WINDOW(
mpWindow ) ) );
+GtkWidgetPath *pCPath = gtk_widget_path_new();
+gtk_widget_path_append_type( pCPath, GTK_TYPE_TEXT_VIEW );
+gtk_widget_path_iter_add_class( pCPath, -1, GTK_STYLE_CLASS_VIEW );
+gtk_style_context_set_path( pCStyle, pCPath );
+gtk_widget_path_free( pCPath );
GdkRGBA field_background_color;
-gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL,
field_background_color);
+gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_NORMAL,
field_background_color);
+g_object_unref( pCStyle );
+
::Color aBackFieldColor = getColor( field_background_color );
-// FIXME: we really need some work getting the right style contexts.
-// it seems a window has a rather different background color from what we
want.
-aBackFieldColor = ::Color( COL_WHITE );
aStyleSet.SetFieldColor( aBackFieldColor );
// This baby is the default page/paper color
aStyleSet.SetWindowColor( aBackFieldColor );
+}
// highlighting colors
gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED,
text_color);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - cppuhelper/source i18npool/CustomTarget_localedata.mk solenv/bin stoc/source vcl/README
cppuhelper/source/bootstrap.cxx| 60 +--
i18npool/CustomTarget_localedata.mk|3
solenv/bin/linkoo | 50 +
stoc/source/simpleregistry/simpleregistry.cxx | 94 +
stoc/source/simpleregistry/textualservices.cxx | 11 ++
stoc/source/simpleregistry/textualservices.hxx |3
vcl/README |2
7 files changed, 179 insertions(+), 44 deletions(-)
New commits:
commit 092a90517889ff7b66a4e7229b897e381bf167f9
Author: Michael Meeks michael.me...@suse.com
Date: Sat Apr 14 01:34:25 2012 +0200
update vcl readme wrt. fpickers
diff --git a/vcl/README b/vcl/README
index 81afba0..f373bad 100644
--- a/vcl/README
+++ b/vcl/README
@@ -1,4 +1,4 @@
-Visual Components Library is responsible for the widgets (windowing, buttons,
controls, etc.) operating system abstraction, including basic rendering (e.g.
the output device).
+Visual Components Library is responsible for the widgets (windowing, buttons,
controls, file-pickers etc.) operating system abstraction, including basic
rendering (e.g. the output device).
Welcome to the Visual Class Libraries (vcl) code
commit 5d646f4ba592764de44f50053802b1ed451d93d7
Author: Michael Meeks michael.me...@suse.com
Date: Fri Apr 13 17:21:21 2012 +0200
i18npool: use URLs for type database in localedata build
diff --git a/i18npool/CustomTarget_localedata.mk
b/i18npool/CustomTarget_localedata.mk
index c21fcd9..e506d46 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -39,7 +39,8 @@ $(IPLD)/localedata_%.cxx :
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,saxparser) $* $ $@.tmp \
- $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb)
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
+ $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \
+ $(call
gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \
-env:LO_LIB_DIR=$(call
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
$(if $(findstring s,$(MAKEFLAGS)), /dev/null 21) \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp $@
\
commit 09524d410bbaad2a0b9b39811cb5cc16621b1396
Author: Michael Meeks michael.me...@suse.com
Date: Fri Apr 13 15:25:23 2012 +0200
stoc: accelerate opening of multiple XML .rdb files in a directory
Instead of nesting these, we aggregate them into a single non-nested
registry, which saves lots of CPU at startup, sadly we can only do
that for the new-style XML registries, so we have to sniff files,
nevertheless this is still far faster. The merged xml files also
break the XSimpleRegistry::getURL() method - but it appears not
to get called.
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 39e44fe..cc64e07 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -274,16 +274,17 @@ Reference registry::XSimpleRegistry readRdbDirectory(
url),
css::uno::Reference css::uno::XInterface ());
}
-for (css::uno::Reference css::registry::XSimpleRegistry last(
- lastRegistry);;)
+std::vectorrtl::OUString aURLs;
+css::uno::Reference css::registry::XSimpleRegistry last(lastRegistry);
+for (;;)
{
osl::DirectoryItem i;
-switch (dir.getNextItem(i, SAL_MAX_UINT32)) {
-case osl::FileBase::E_None:
+osl::FileBase::RC eResult;
+eResult = dir.getNextItem(i, SAL_MAX_UINT32);
+if (eResult == osl::FileBase::E_NOENT)
break;
-case osl::FileBase::E_NOENT:
-return last;
-default:
+if (eResult != osl::FileBase::E_None)
+{
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(cannot iterate directory )) +
@@ -307,12 +308,49 @@ Reference registry::XSimpleRegistry readRdbDirectory(
if (aName.toChar() == '.' || aName.endsWithAsciiL(~, 1))
continue;
-if (stat.getFileType() != osl::FileStatus::Directory) { //TODO:
symlinks
-last = readRdbFile(
-stat.getFileURL(), fatalErrors, last, simpleRegistryFactory,
-nestedRegistryFactory);
+if (stat.getFileType() != osl::FileStatus::Directory) //TODO: symlinks
+aURLs.push_back(stat.getFileURL());
+}
+
+size_t nXML = 0;
+for (std::vectorrtl::OUString::iterator it = aURLs.begin(); it !=
aURLs.end(); it++)
+{
+// Read / sniff the nasty files ...
+osl::File aIn( *it );
+if (aIn.open(osl_File_OpenFlag_Read) != osl::FileBase::E_None
[Libreoffice-commits] .: stoc/README
stoc/README | 39 +++ 1 file changed, 39 insertions(+) New commits: commit 96823006127dbae9dad2833b40c7f9cc7d467ce9 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 3 12:59:26 2012 +0100 stoc: add helpful structural documentation from mailing list post. diff --git a/stoc/README b/stoc/README index db0e857..58f0c6f 100644 --- a/stoc/README +++ b/stoc/README @@ -1 +1,40 @@ Registries, reflection, introspection implementation for UNO. + + +The UNO types and services bootstrapping code is very old, and concepts +are tightly knit together. Whenever you want to change something you risk +backwards incompatibility. The code causes mental pain, and whenever +you need to touch it you want to run away screaming. One typically ends +up doing minimally invasive changes. That way, you have a chance of +surviving the process. But you also pile up guilt. + +At the heart of the matter there is the old binary store file structure +and the XRegistry interface on top of it. At runtime, both all the UNO +type information (scattered across a number of binary rdb files) and +all the UNO service information (scattered across a number of rdb files +that used to be binary but have been mostly changed to XML now) are +represented by a single XRegistry instance each. + +The way the respective information is represented in the XRegistry +interface simply corresponds to the way the information is stored in the +binary rdb files. Those files are designed for storage of hierarchically +nested small blobs of information. Hence, for example information about +a UNO interface type com.sun.star.foo.XBar is stored in a nested folder +with path com - sun - star - foo - XBar, containing little blobs of +information about the type's ancestors, its methods, etc. Similarly +for information about instantiable services like com.sun.star.baz.Boz. + +As there are typically multiple rdb files containing types resp. +services (URE specific, LO specific, from extensions, ...), but they need +to be represented by a single XRegistry instance, so nested registries +were invented. They effectively form a linear list of chaining XRegistry +instances together. Whenever a path needs to be looked up in the top-level +registry, it effectively searches through the linear list of nested +registries. All with the cumbersome UNO XRegistry interface between +the individual parts. Horror. + +When the XML service rdbs were introduced, we chickened out (see above +for rationale) and put them behind an XRegistry facade, so that they +would seamlessly integrate with the existing mess. We postponed +systematic clean-up to the pie-in-the-sky days of LO 4 (or, once we'll +become incompatible with OOo, as the phrase used to be back then) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/rtl sal/util tools/inc
sal/inc/rtl/ustrbuf.h | 28 +
sal/inc/rtl/ustrbuf.hxx|7 ++
sal/rtl/source/strimp.hxx | 18
sal/rtl/source/string.cxx |5
sal/rtl/source/strtmpl.cxx |8 ---
sal/rtl/source/uri.cxx |2 +
sal/rtl/source/ustrbuf.cxx | 50 -
sal/rtl/source/ustring.cxx | 15 -
sal/util/sal.map |2 +
tools/inc/tools/string.hxx |4 ++-
10 files changed, 89 insertions(+), 50 deletions(-)
New commits:
commit 1426d4432c59ef42f28642ec63e57517223eb32d
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 30 18:27:58 2012 +0100
sal: expose more stringbuffer related instrumentation points
Avoid ref/unref pair in makeStringAndClear, hook into the
stringbuffer-like 'String' class to expose it's conversion to
immutable strings, and fixup misc. missing instrumentation.
diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h
index 0863da0..1051d0d 100644
--- a/sal/inc/rtl/ustrbuf.h
+++ b/sal/inc/rtl/ustrbuf.h
@@ -179,6 +179,34 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uStringbuffer_remove(
sal_Int32 start,
sal_Int32 len );
+/**
+Returns an immutable rtl_uString object, while clearing the string buffer.
+
+This method is primarily used to allow these completed
+string allocation events to be traced.
+
+@param ppThis The string, on that the operation should take place
+@param nCapacity pointer to the capacity of the string buffer
+
+@since LibreOffice 3.6
+ */
+SAL_DLLPUBLIC rtl_uString * SAL_CALL rtl_uStringBuffer_makeStringAndClear(
+/*inout*/ rtl_uString ** ppThis,
+sal_Int32 *nCapacity );
+
+/**
+References and returns an immutable rtl_uString object, from a mutable
+string-buffer object.
+
+This method is primarily used to allow legacy 'String' class
+conversions to OUString to be accurately traced.
+
+@param pThis The string, on that the operation should take place
+
+@since LibreOffice 3.6
+ */
+SAL_DLLPUBLIC rtl_uString * SAL_CALL rtl_uStringBuffer_refReturn( rtl_uString
*pThis );
+
#ifdef __cplusplus
}
#endif
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 99afe44..02a507c 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -181,10 +181,9 @@ public:
*/
OUString makeStringAndClear()
{
-OUString aRet( pData );
-rtl_uString_new(pData);
-nCapacity = 0;
-return aRet;
+return OUString(
+ rtl_uStringBuffer_makeStringAndClear( pData, nCapacity ),
+ SAL_NO_ACQUIRE );
}
/**
diff --git a/sal/rtl/source/strimp.hxx b/sal/rtl/source/strimp.hxx
index a9e5a38..82f7f41 100644
--- a/sal/rtl/source/strimp.hxx
+++ b/sal/rtl/source/strimp.hxx
@@ -54,6 +54,24 @@ sal_Int16 rtl_ImplGetDigit( sal_Unicode ch, sal_Int16 nRadix
);
sal_Bool rtl_ImplIsWhitespace( sal_Unicode c );
+// string lifetime instrumentation / diagnostics
+#if 0
+# include rtl/ustring.hxx
+# define RTL_LOG_STRING_NEW(s) \
+ do {
\
+ fprintf (stderr, +%s\n,
\
+ rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr());
\
+ } while (0)
+# define RTL_LOG_STRING_DELETE(s) \
+ do {
\
+ fprintf (stderr, -%s\n,
\
+ rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr());
\
+ } while (0)
+#else
+# define RTL_LOG_STRING_NEW(s)
+# define RTL_LOG_STRING_DELETE(s)
+#endif
+
#endif /* INCLUDED_RTL_SOURCE_STRIMP_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/string.cxx b/sal/rtl/source/string.cxx
index 9c5393f..42c8ae2 100644
--- a/sal/rtl/source/string.cxx
+++ b/sal/rtl/source/string.cxx
@@ -71,6 +71,11 @@ static rtl_String const aImplEmpty_rtl_String =
#define IMPL_RTL_STRINGDATA rtl_String
#define IMPL_RTL_EMPTYSTRINGaImplEmpty_rtl_String
+#undef RTL_LOG_STRING_NEW
+#define RTL_LOG_STRING_NEW(s)
+#undef RTL_LOG_STRING_DELETE
+#define RTL_LOG_STRING_DELETE(s)
+
/* === */
/* Include String/UString template code */
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index 8e1de8b..2a33907 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -49,12 +49,6 @@ inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
}
*/
-// for instrumentation / diagnostics
-#ifndef
[Libreoffice-commits] .: sal/rtl
sal/rtl/source/uri.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 54bc03051702ad279dfd17471a3d5c30003c892d
Author: Michael Meeks michael.me...@suse.com
Date: Mon Apr 2 14:26:43 2012 +0100
sal: reduce allocation thrash in URI encode / decode
This saves 1% of string allocation / destruction on startup.
diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index 5febefd..3945e04 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -609,8 +609,8 @@ void SAL_CALL rtl_uriEncode(rtl_uString * pText, sal_Bool
const * pCharClass,
sal_Unicode const * p = pText-buffer;
sal_Unicode const * pEnd = p + pText-length;
-sal_Int32 nCapacity = 0;
-rtl_uString_new(pResult);
+sal_Int32 nCapacity = pText-length;
+rtl_uString_new_WithLength(pResult, nCapacity);
while (p pEnd)
{
EscapeType eType;
@@ -676,8 +676,8 @@ void SAL_CALL rtl_uriDecode(rtl_uString * pText,
{
sal_Unicode const * p = pText-buffer;
sal_Unicode const * pEnd = p + pText-length;
-sal_Int32 nCapacity = 0;
-rtl_uString_new(pResult);
+sal_Int32 nCapacity = pText-length;
+rtl_uString_new_WithLength(pResult, nCapacity);
while (p pEnd)
{
EscapeType eType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/shutdowniconunx.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8fa3aae7b302d3c9846bfa352c1db619a5b05ca0 Author: Michael Meeks michael.me...@suse.com Date: Mon Apr 2 20:26:24 2012 +0100 fdo#34324 - fix colorspace conversion for greyscale bitmaps diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index b249544..8aad0f6 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -90,6 +90,9 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId ) Bitmap pInSalBitmap = aIcon.GetBitmap(); AlphaMask pInSalAlpha = aIcon.GetAlpha(); +if( pInSalBitmap.GetBitCount() != 24 ) +pInSalBitmap.Convert( BMP_CONVERSION_24BIT ); + Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap); AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/appl/shutdowniconunx.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 33894f76b4555e2261cd723fd5fc93998b42aae1 Author: Michael Meeks michael.me...@suse.com Date: Mon Apr 2 20:26:24 2012 +0100 fdo#34324 - fix colorspace conversion for greyscale bitmaps Signed-off-by: Andras Timar tima...@gmail.com diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 9ce5ff0..d65765d 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -90,6 +90,9 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId ) Bitmap pInSalBitmap = aIcon.GetBitmap(); AlphaMask pInSalAlpha = aIcon.GetAlpha(); +if( pInSalBitmap.GetBitCount() != 24 ) +pInSalBitmap.Convert( BMP_CONVERSION_24BIT ); + Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap); AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - Module_tail_build.mk sc/prj
Module_tail_build.mk |1 + sc/prj/build.lst |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit c2bf5b555624bb362307fa98266641afe0c67cea Author: Michael Meeks michael.me...@suse.com Date: Fri Mar 30 12:54:06 2012 +0100 tubes: couple tubes up to the build logic diff --git a/Module_tail_build.mk b/Module_tail_build.mk index dcbbdda..e56ea5c 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ swext \ test \ toolkit \ +tubes \ ucb \ UnoControls \ unoxml \ diff --git a/sc/prj/build.lst b/sc/prj/build.lst index bf5e7d4..4168f67 100644 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -1,2 +1,2 @@ -sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity NULL +sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity tubes NULL sc sc\prj nmake - all sc_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/rtl
sal/rtl/source/strtmpl.cxx | 46 -
sal/rtl/source/ustring.cxx | 18 +
2 files changed, 51 insertions(+), 13 deletions(-)
New commits:
commit 81a4e4ba99b1534949e66bf81c723c2123fd47f0
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 30 15:14:10 2012 +0100
sal: add a more permanant set of annotations for lifetime tracking.
Having done this on a temporary basis a couple of times before,
it'd be good to avoid having to do the instrumentation again.
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index 2d8c44b..026d647 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -49,6 +49,12 @@ inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
}
*/
+// for instrumentation / diagnostics
+#ifndef RTL_LOG_STRING_NEW
+# define RTL_LOG_STRING_NEW(s)
+# define RTL_LOG_STRING_DELETE(s)
+#endif
+
#define rtl_str_ImplCopy( _pDest, _pSrc, _nCount ) \
{ \
IMPL_RTL_STRCODE* __mm_pDest = _pDest; \
@@ -1014,6 +1020,8 @@ static IMPL_RTL_STRCODE* IMPL_RTL_STRINGNAME( ImplNewCopy
)( IMPL_RTL_STRINGDATA
}
*ppThis = pData;
+
+RTL_LOG_STRING_NEW( pData );
return pDest;
}
@@ -1055,6 +1063,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( release )(
IMPL_RTL_STRINGDATA* pThis )
if ( pThis-refCount == 1 ||
!osl_decrementInterlockedCount( (pThis-refCount) ) )
{
+RTL_LOG_STRING_DELETE( pThis );
rtl_freeMemory( pThis );
}
}
@@ -1112,8 +1121,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromString )(
IMPL_RTL_STRINGDATA** ppThis
*ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( pStr-length );
OSL_ASSERT(*ppThis != NULL);
rtl_str_ImplCopy( (*ppThis)-buffer, pStr-buffer, pStr-length );
+RTL_LOG_STRING_NEW( *ppThis );
-/* must be done at least, if pStr == *ppThis */
+/* must be done last, if pStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1156,7 +1166,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr )(
IMPL_RTL_STRINGDATA** ppThis,
}
while ( *pCharStr );
-/* must be done at least, if pCharStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+
+/* must be done last, if pCharStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1181,7 +1193,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr_WithLength
)( IMPL_RTL_STRINGDATA*
OSL_ASSERT(*ppThis != NULL);
rtl_str_ImplCopy( (*ppThis)-buffer, pCharStr, nLen );
-/* must be done at least, if pCharStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+
+/* must be done last, if pCharStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1220,6 +1234,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral)(
IMPL_RTL_STRINGDATA** ppThis
pCharStr++;
}
}
+
+RTL_LOG_STRING_NEW( *ppThis );
}
/* --- */
@@ -1280,9 +1296,11 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newConcat )(
IMPL_RTL_STRINGDATA** ppThis,
rtl_str_ImplCopy( pTempStr-buffer, pLeft-buffer, pLeft-length );
rtl_str_ImplCopy( pTempStr-buffer+pLeft-length, pRight-buffer,
pRight-length );
*ppThis = pTempStr;
+
+RTL_LOG_STRING_NEW( *ppThis );
}
-/* must be done at least, if left or right == *ppThis */
+/* must be done last, if left or right == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1334,7 +1352,6 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplaceStrAt )(
IMPL_RTL_STRINGDATA** ppTh
return;
}
-{
IMPL_RTL_STRINGDATA*pOrg = *ppThis;
IMPL_RTL_STRCODE* pBuffer;
sal_Int32 nNewLen;
@@ -1360,10 +1377,10 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplaceStrAt )(
IMPL_RTL_STRINGDATA** ppTh
}
rtl_str_ImplCopy( pBuffer, pStr-buffer+nIndex+nCount,
pStr-length-nIndex-nCount );
-/* must be done at least, if pStr or pNewSubStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+/* must be done last, if pStr or pNewSubStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
-}
}
/* --- */
@@ -1421,7 +1438,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplace )(
IMPL_RTL_STRINGDATA** ppThis,
IMPL_RTL_AQUIRE( pStr );
}
-/* must be done at least, if pStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+/* must be done last, if pStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1482,7 +1500,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newToAsciiLowerCase )(
IMPL_RTL_STRINGDATA**
IMPL_RTL_AQUIRE( pStr );
}
-/* must be done at least
[Libreoffice-commits] .: distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf
distro-configs/LibreOfficeMinGW.conf |1 + distro-configs/LibreOfficeWin32.conf |1 + distro-configs/LibreOfficeWin64.conf |1 + 3 files changed, 3 insertions(+) New commits: commit 6219ff898a8c3ae6b7abe4272b4b68cc986093e4 Author: Michael Meeks michael.me...@suse.com Date: Thu Mar 29 11:09:24 2012 +0100 Disable cairo canvas on Windows fdo#46901 fdo#46532 We never used cairocanvas on Win, this got accidentally enabled due to configure.in cleanups. Not that we shouldn't, but it needs some more fixing ( Analog of Thorsten's Mac commit for fdo#45584 ) diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index 7d4bc8a..32df782 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -22,6 +22,7 @@ --without-myspell-dicts --disable-activex --disable-binfilter +--disable-cairo-canvas --disable-build-mozilla --disable-directx --disable-extension-integration diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index f608e9b..9bf7609 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -8,6 +8,7 @@ --with-java-target-version=1.5 --disable-activex-component --enable-binfilter +--disable-cairo-canvas --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-wiki-publisher diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index b4e21c6..66404d4 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -2,6 +2,7 @@ --without-agfa-monotype-fonts --with-java-target-version=1.5 --enable-cl-x64 +--disable-cairo-canvas --disable-activex-component --enable-ext-scripting-beanshell --enable-ext-scripting-javascript ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |5 -
desktop/source/deployment/inc/dp_ucb.h| 25
++-
desktop/source/deployment/manager/dp_manager.cxx | 32
+++---
desktop/source/deployment/misc/dp_ucb.cxx |7 --
desktop/source/deployment/registry/component/dp_component.cxx |6 -
desktop/source/deployment/registry/configuration/dp_configuration.cxx |6 -
desktop/source/deployment/registry/dp_backend.cxx |6 -
desktop/source/deployment/registry/dp_registry.cxx|3
desktop/source/deployment/registry/executable/dp_executable.cxx |3
desktop/source/deployment/registry/help/dp_help.cxx |3
desktop/source/deployment/registry/package/dp_package.cxx | 13
+---
11 files changed, 52 insertions(+), 57 deletions(-)
New commits:
commit 9404908713453ed1604d66b974536523a253b72f
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 29 12:02:59 2012 +0100
desktop: unwind hideous StrTitle mess a little
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 6c09084..fd6154e 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -90,9 +90,9 @@ class Window;
namespace cssu = ::com::sun::star::uno;
namespace css = ::com::sun::star;
+using dp_misc::StrTitle;
using ::rtl::OUString;
-
namespace dp_gui {
class UpdateInstallDialog::Thread: public salhelper::Thread {
@@ -619,8 +619,7 @@ void UpdateInstallDialog::Thread::download(OUString const
sDownloadURL, Update
::ucbhelper::Content sourceContent;
dp_misc::create_ucb_content( sourceContent, sDownloadURL,
m_updateCmdEnv.get() );
-const OUString sTitle(sourceContent.getPropertyValue(
- dp_misc::StrTitle::get() ).getOUString() );
+const OUString sTitle( StrTitle::getTitle( sourceContent ) );
if (destFolderContent.transferContent(
sourceContent, ::ucbhelper::InsertOperation_COPY,
diff --git a/desktop/source/deployment/inc/dp_ucb.h
b/desktop/source/deployment/inc/dp_ucb.h
index 52ac313..befd539 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -32,8 +32,10 @@
#include list
#include rtl/byteseq.hxx
#include rtl/instance.hxx
+#include com/sun/star/sdbc/XResultSet.hpp
#include com/sun/star/ucb/XCommandEnvironment.hpp
#include dp_misc_api.hxx
+#include ucbhelper/content.hxx
namespace ucbhelper
{
@@ -44,10 +46,27 @@ namespace css = ::com::sun::star;
namespace dp_misc {
-struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle :
-public rtl::StaticWithInitrtl::OUString, StrTitle
+struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle
{
-const rtl::OUString operator () ();
+static css::uno::Sequence rtl::OUString getTitleSequence()
+{
+css::uno::Sequence rtl::OUString aSeq( 1 );
+aSeq[ 0 ] = Title;
+return aSeq;
+}
+static rtl::OUString getTitle( ::ucbhelper::Content rContent )
+{
+return rtl::OUString( rContent.getPropertyValue(
+rtl::OUString::createFromAscii( Title )
).getrtl::OUString() );
+}
+// just return titles - the ucbhelper should have a simpler API for this
[!]
+static css::uno::Reference css::sdbc::XResultSet
+createCursor( ::ucbhelper::Content rContent,
+ ucbhelper::ResultSetInclude eInclude )
+{
+return css::uno::Reference css::sdbc::XResultSet (
+rContent.createCursor( StrTitle::getTitleSequence(), eInclude
) );
+}
};
//==
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 80a9522..0ed519b 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -104,12 +104,9 @@ namespace {
OUString getExtensionFolder(OUString const parentFolder,
Referenceucb::XCommandEnvironment const
xCmdEnv)
{
-::ucbhelper::Content tempFolder(
-parentFolder, xCmdEnv );
+::ucbhelper::Content tempFolder( parentFolder, xCmdEnv );
Referencesdbc::XResultSet xResultSet(
-tempFolder.createCursor(
-SequenceOUString( StrTitle::get(), 1 ),
-::ucbhelper::INCLUDE_FOLDERS_ONLY ) );
+StrTitle::createCursor (tempFolder,
::ucbhelper::INCLUDE_FOLDERS_ONLY ) );
OUString title;
while (xResultSet-next())
@@ -136,9 +133,8 @@ void PackageManagerImpl::initActivationLayer(
{
// scan for all entries in m_packagesDir:
Referencesdbc::XResultSet xResultSet
[Libreoffice-commits] .: Branch 'feature/tubes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - editeng/source filter/source sc/source starmath/source svtools/inc toolkit/source
editeng/source/misc/svxacorr.cxx|1 - filter/source/xsltdialog/xmlfileview.hxx|1 - sc/source/filter/html/htmlpars.cxx |1 - starmath/source/math_pch.cxx|1 - svtools/inc/svtools/treelist.hxx|2 +- toolkit/source/controls/unocontrol.cxx |1 - toolkit/source/controls/unocontrolmodel.cxx |1 - 7 files changed, 1 insertion(+), 7 deletions(-) New commits: commit 483177482aebe7c7baea1083855eba05f37b59ff Author: Noel Grandin n...@peralex.com Date: Thu Mar 29 17:51:24 2012 +0100 Remove unnecessary tools/table.hxx includes diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index ac726c8..651b9eb 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -29,7 +29,6 @@ #include com/sun/star/io/XStream.hpp #include com/sun/star/lang/Locale.hpp #include tools/urlobj.hxx -#include tools/table.hxx #include i18npool/mslangid.hxx #include vcl/svapp.hxx #include sot/storinfo.hxx diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx index 4ff36a4..5623fab 100644 --- a/filter/source/xsltdialog/xmlfileview.hxx +++ b/filter/source/xsltdialog/xmlfileview.hxx @@ -32,7 +32,6 @@ #include svl/lstner.hxx #include vcl/timer.hxx -#include tools/table.hxx #include svtools/xtextedt.hxx #include vcl/timer.hxx #include vcl/wrkwin.hxx diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index b9f9fb8..5c3c210 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -58,7 +58,6 @@ #include vcl/svapp.hxx #include tools/urlobj.hxx #include tools/tenccvt.hxx -#include tools/table.hxx #include htmlpars.hxx #include global.hxx diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index ee17d65..945025c 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -349,7 +349,6 @@ #include vcl/metric.hxx #include sfx2/inimgr.hxx #include node.hxx -#include tools/table.hxx #include sfx2/docfac.hxx #include svl/ownlist.hxx #include sfx2/objsh.hxx diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index b2a7173..c505e27 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -29,12 +29,12 @@ #ifndef _SVTREELIST_HXX #define _SVTREELIST_HXX +#include limits.h #include svtools/svtdllapi.h #include tools/solar.h #include vector #include boost/ptr_container/ptr_map.hpp -#include tools/table.hxx #include tools/link.hxx #include tools/string.hxx #include tools/debug.hxx diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index b845b59..cec8c40 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -39,7 +39,6 @@ #include rtl/memory.h #include rtl/uuid.h #include osl/mutex.hxx -#include tools/table.hxx #include tools/date.hxx #include tools/debug.hxx #include tools/diagnose_ex.h diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index ac7f3ed..8afc19e 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -43,7 +43,6 @@ #include rtl/memory.h #include rtl/uuid.h #include tools/diagnose_ex.h -#include tools/table.hxx #include tools/date.hxx #include tools/time.hxx #include tools/debug.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source filter/source sc/source starmath/source svtools/inc toolkit/source
editeng/source/editeng/editdoc.hxx |1 - editeng/source/misc/svxacorr.cxx|1 - filter/source/xsltdialog/xmlfileview.hxx|1 - sc/source/filter/html/htmlpars.cxx |1 - starmath/source/math_pch.cxx|1 - svtools/inc/svtools/treelist.hxx|2 +- toolkit/source/controls/unocontrol.cxx |1 - toolkit/source/controls/unocontrolmodel.cxx |1 - 8 files changed, 1 insertion(+), 8 deletions(-) New commits: commit 82f5a3b5df000966d344b26fe36e776bc947c6ef Author: Noel Grandin n...@peralex.com Date: Thu Mar 29 16:49:07 2012 +0200 Remove unnecessary tools/table.hxx #includes diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 59010d6..bf00c76 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -37,7 +37,6 @@ #include svl/itemset.hxx #include svl/style.hxx #include svl/itempool.hxx -#include tools/table.hxx #include vector #include deque diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index ac726c8..651b9eb 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -29,7 +29,6 @@ #include com/sun/star/io/XStream.hpp #include com/sun/star/lang/Locale.hpp #include tools/urlobj.hxx -#include tools/table.hxx #include i18npool/mslangid.hxx #include vcl/svapp.hxx #include sot/storinfo.hxx diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx index 4ff36a4..5623fab 100644 --- a/filter/source/xsltdialog/xmlfileview.hxx +++ b/filter/source/xsltdialog/xmlfileview.hxx @@ -32,7 +32,6 @@ #include svl/lstner.hxx #include vcl/timer.hxx -#include tools/table.hxx #include svtools/xtextedt.hxx #include vcl/timer.hxx #include vcl/wrkwin.hxx diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index aaae381..019d057 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -58,7 +58,6 @@ #include vcl/svapp.hxx #include tools/urlobj.hxx #include tools/tenccvt.hxx -#include tools/table.hxx #include htmlpars.hxx #include global.hxx diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index ee17d65..945025c 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -349,7 +349,6 @@ #include vcl/metric.hxx #include sfx2/inimgr.hxx #include node.hxx -#include tools/table.hxx #include sfx2/docfac.hxx #include svl/ownlist.hxx #include sfx2/objsh.hxx diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index b2a7173..c505e27 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -29,12 +29,12 @@ #ifndef _SVTREELIST_HXX #define _SVTREELIST_HXX +#include limits.h #include svtools/svtdllapi.h #include tools/solar.h #include vector #include boost/ptr_container/ptr_map.hpp -#include tools/table.hxx #include tools/link.hxx #include tools/string.hxx #include tools/debug.hxx diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index b845b59..cec8c40 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -39,7 +39,6 @@ #include rtl/memory.h #include rtl/uuid.h #include osl/mutex.hxx -#include tools/table.hxx #include tools/date.hxx #include tools/debug.hxx #include tools/diagnose_ex.h diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index ac7f3ed..8afc19e 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -43,7 +43,6 @@ #include rtl/memory.h #include rtl/uuid.h #include tools/diagnose_ex.h -#include tools/table.hxx #include tools/date.hxx #include tools/time.hxx #include tools/debug.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - cui/source
cui/source/tabpages/tpline.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 12d4ad922bce712d72c52e5ef9cd5e7b5e74fe73
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Mar 26 16:26:32 2012 -0400
fdo#46942: Fix a regression caused by List removal.
3236c2c3af9355157c62f68fcbd429498f7f747b accidentally removed the gallery
item count which was used to differentiate the gallery symbols from
normal ones.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3a27eaa..abb5df3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1464,6 +1464,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton
*, pButton )
String aEmptyStr;
const String *pUIName = NULL;
sal_uInt32 i = 0;
+nNumMenuGalleryItems = aGrfNames.size();
for(std::vectorString::iterator it = aGrfNames.begin(); it !=
aGrfNames.end(); ++it, ++i)
{
pUIName = (*it);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |2 ++
sc/source/ui/namedlg/namemgrtable.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit 801c5d5b88454f659a08d9a4940b90499bec9584
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Mar 26 04:58:47 2012 +0200
prevent update during init in new autofilter dlg, fdo#45679
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 9b23197..d269333 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1164,6 +1164,7 @@ void ScCheckListMenuWindow::initMembers()
{
size_t n = maMembers.size();
size_t nVisMemCount = 0;
+maChecks.SetUpdateMode(false);
for (size_t i = 0; i n; ++i)
{
maChecks.InsertEntry(maMembers[i].maName);
@@ -1188,6 +1189,7 @@ void ScCheckListMenuWindow::initMembers()
maChkToggleAll.SetState(STATE_DONTKNOW);
mePrevToggleAllState = STATE_DONTKNOW;
}
+maChecks.SetUpdateMode(true);
}
void ScCheckListMenuWindow::setConfig(const Config rConfig)
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index b9164d3..5a02130 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -127,6 +127,7 @@ void ScRangeManagerTable::GetLine(ScRangeNameLine rLine,
SvLBoxEntry* pEntry)
void ScRangeManagerTable::Init()
{
+SetUpdateMode(false);
Clear();
for (boost::ptr_maprtl::OUString, ScRangeName::const_iterator itr =
mrRangeMap.begin();
itr != mrRangeMap.end(); ++itr)
@@ -147,6 +148,7 @@ void ScRangeManagerTable::Init()
}
}
}
+SetUpdateMode(true);
}
const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine
rLine)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extras/source
extras/source/palettes/standard.soe |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit a35ce053b05f48e7c62deb24649e20257ee6cca2 Author: Regina Henschel rb.hensc...@t-online.de Date: Sun Mar 25 21:12:52 2012 +0200 Adapt arrowhead pathes to corrected svg path z hangling Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/extras/source/palettes/standard.soe b/extras/source/palettes/standard.soe index 5a8acd9..4b576b1 100644 --- a/extras/source/palettes/standard.soe +++ b/extras/source/palettes/standard.soe @@ -13,11 +13,11 @@ draw:marker draw:name=Square 45 svg:viewBox=0 0 1131 1131 svg:d=m0 564 564 567 567-567-567-564z / draw:marker draw:name=Arrow concave svg:viewBox=0 0 1131 1580 svg:d=m1013 1491 118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z/draw:marker draw:marker draw:name=Short line Arrow svg:viewBox=0 0 3000 3000 svg:d=m1500 0 1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 2392h-114v-211z/draw:marker - draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 0 1500 3000h-3000zm1500-2553-1176 2353h2353z/draw:marker - draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm1500-2553-1276 2553 1276 2553 1276-2553z/draw:marker + draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 0 1500 3000h-3000zm0 447-1176 2353h2353z/draw:marker + draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm0 447-1276 2553 1276 2553 1276-2553z/draw:marker draw:marker draw:name=Diamond svg:viewBox=0 0 3000 6000 svg:d=m1500 0 1500 3000-1500 3000-1500-3000z/draw:marker draw:marker draw:name=Circle unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 201 750-63 511-201 750-310 411-549 549-474 201-750 201zm0-200c-239 0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z/draw:marker - draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm-1500 1215-1215-1215 1215-1215 1215 1215z/draw:marker - draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 0h300v300h-300zm20-280h260v260h-260z/draw:marker + draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm0-285 -1215-1215 1215-1215 1215 1215z/draw:marker + draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 0h300v300h-300zm20 20h260v260h-260z/draw:marker draw:marker draw:name=Half Circle unfilled svg:viewBox=0 0 15000 8746 svg:d=m14971 0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 1206-761 1804-345 597-733 1110-1183 1560-451 450-964 837-1562 1182-598 345-1190 596-1806 760-600 161-1223 240-1894 244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760-598-345--732-1562-1182-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943 0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 151 566 383 1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 550 317 1095 548 1661 700 566 151 1154 223 1789 223s1223-72 1789-223c566-152 -383 1661-700 550-318 1023-673 1438-1087 414-415 770-887 1088-1437 317-549 549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z / /office:marker-table \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/collab/collab.cxx | 37 ++--
sc/source/ui/collab/sendfunc.cxx | 44 +--
sc/source/ui/inc/collab.hxx | 12 +++---
3 files changed, 85 insertions(+), 8 deletions(-)
New commits:
commit fe1107971a734ddc3e06b1d05f1295331338715c
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 23 11:29:48 2012 +
tubes: add hooks for send / recv file (untested)
diff --git a/sc/source/ui/collab/collab.cxx b/sc/source/ui/collab/collab.cxx
index 87d6f93..fdb1a30 100644
--- a/sc/source/ui/collab/collab.cxx
+++ b/sc/source/ui/collab/collab.cxx
@@ -31,9 +31,11 @@
#include tubes/conference.hxx
#include tubes/contact-list.hxx
-ScCollaboration::ScCollaboration( const Link rLink )
+ScCollaboration::ScCollaboration( const Link rLinkPacket,
+ const Link rLinkFile )
:
-maLink( rLink),
+maLinkPacket( rLinkPacket ),
+maLinkFile( rLinkFile ),
mpAccount( NULL),
mpContact( NULL),
mpManager( NULL)
@@ -51,11 +53,28 @@ ScCollaboration::~ScCollaboration()
}
+void ScCollaboration::receivedFile( rtl::OUString rFileURL )
+{
+fprintf( stderr, file recieved '%s'\n,
+ rtl::OUStringToOString( rFileURL, RTL_TEXTENCODING_UTF8
).getStr() );
+if ( maLinkFile.IsSet() )
+maLinkFile.Call( rFileURL );
+}
+
+extern C {
+void file_recv_cb( rtl::OUString localUri, void* pUserData )
+{
+ScCollaboration *pCollab = reinterpret_castScCollaboration *(
pUserData );
+pCollab-receivedFile( localUri );
+}
+}
+
bool ScCollaboration::initManager()
{
-mpManager = new TeleManager( maLink);
+mpManager = new TeleManager( maLinkPacket );
bool bOk = mpManager-connect();
mpManager-prepareAccountManager();
+mpManager-setFileReceivedCallback( file_recv_cb, (void *)this );
return bOk;
}
@@ -97,4 +116,16 @@ bool ScCollaboration::recvPacket( rtl::OString rString,
TeleConference* pConfer
return bOk;
}
+extern C {
+static void file_sent_cb( bool aSuccess, void* /* pUserData */ )
+{
+fprintf( stderr, File send %s\n, aSuccess ? success : failed );
+}
+}
+
+void ScCollaboration::sendFile( rtl::OUString rFileURL )
+{
+mpManager-sendFile( rFileURL, file_sent_cb, NULL );
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index ed08955..afeef96 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -37,9 +37,12 @@
#include tubes/conference.hxx
// new file send/recv fun ...
+#include com/sun/star/uno/Sequence.hxx
#include unotools/tempfile.hxx
#include unotools/localfilehelper.hxx
#include comphelper/mediadescriptor.hxx
+#include com/sun/star/frame/XLoadable.hpp
+#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/document/XDocumentRecovery.hpp
namespace css = ::com::sun::star;
@@ -253,6 +256,7 @@ public:
}
DECL_LINK( ReceiverCallback, TeleConference* );
+DECL_LINK( ReceiveFileCallback, rtl::OUString * );
void RecvMessage( const rtl::OString rString )
{
@@ -299,6 +303,38 @@ IMPL_LINK( ScDocFuncRecv, ReceiverCallback,
TeleConference*, pConference )
return 0;
}
+IMPL_LINK( ScDocFuncRecv, ReceiveFileCallback, rtl::OUString *, pStr )
+{
+fprintf( stderr, incoming file '%s'\n,
+ rtl::OUStringToOString( *pStr, RTL_TEXTENCODING_UTF8 ).getStr() );
+
+css::uno::Sequence css::beans::PropertyValue aLoadArgs(5);
+aLoadArgs[0].Name = rtl::OUString( URL );
+aLoadArgs[0].Value = (*pStr);
+aLoadArgs[1].Name = rtl::OUString( FilterName );
+aLoadArgs[1].Value = rtl::OUString( calc8 );
+aLoadArgs[2].Name = rtl::OUString( Referer );
+aLoadArgs[2].Value = rtl::OUString( );
+// no interaction handler ?
+aLoadArgs[3].Name = rtl::OUString( MacroExecutionMode );
+aLoadArgs[3].Value = sal_Int32( 3 );
+aLoadArgs[4].Name = rtl::OUString( UpdateDocMode );
+aLoadArgs[4].Value = sal_Int32( 2 );
+
+try
+{
+css::uno::Reference css::frame::XLoadable xLoad(
+rDocShell.GetBaseModel(), css::uno::UNO_QUERY_THROW );
+xLoad-load( aLoadArgs );
+}
+catch ( css::uno::Exception )
+{
+fprintf( stderr, exception when loading !\n );
+}
+
+return 0;
+}
+
class ScDocFuncSend : public ScDocFunc
{
ScDocFuncRecv *mpChain;
@@ -337,7 +373,9 @@ class ScDocFuncSend : public ScDocFunc
fprintf( stderr, Temp file is '%s'\n,
rtl::OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8
).getStr() );
-}
+
+mpCollab-sendFile( aFileURL );
+}
public:
// FIXME: really ScDocFunc should be an abstract base, so
@@ -478,7 +516,9 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
ScDocFuncRecv* pReceiver = new ScDocFuncRecv( *this, new
ScDocFuncDirect
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/collab/sendfunc.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 5db9b41638b66b1198b65b72d31c36613475fd25 Author: Michael Meeks michael.me...@suse.com Date: Fri Mar 23 11:32:13 2012 + tubes: fix crash with no collaboration setup diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 4e16629..50d6649 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -374,7 +374,8 @@ class ScDocFuncSend : public ScDocFunc fprintf( stderr, Temp file is '%s'\n, rtl::OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); -mpCollab-sendFile( aFileURL ); +if ( mpCollab ) +mpCollab-sendFile( aFileURL ); } public: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/collab/sendfunc.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 171bb4d0cd214ad436c691b1683c7cb7139c5920
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 23 13:13:30 2012 +
tubes: more helpful exception printing on file load failure
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 50d6649..771ee8b 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -327,9 +327,10 @@ IMPL_LINK( ScDocFuncRecv, ReceiveFileCallback,
rtl::OUString *, pStr )
rDocShell.GetBaseModel(), css::uno::UNO_QUERY_THROW );
xLoad-load( aLoadArgs );
}
-catch ( css::uno::Exception )
+catch ( css::uno::Exception e )
{
-fprintf( stderr, exception when loading !\n );
+fprintf( stderr, exception when loading '%s' !\n,
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
}
return 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/CppunitTest_sc_ucalc.mk sc/source tubes/README
sc/CppunitTest_sc_ucalc.mk |6 ++
sc/source/ui/collab/sendfunc.cxx | 36 ++--
tubes/README | 18 ++
3 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit 70f51922b9e1ac57e6a0548f249732c27d856ba7
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 23 16:01:00 2012 +
tubes: update readme, get -something- working wrt. document transfer
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 87f39ff..cf81696 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -45,6 +45,12 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
$(call gb_Library_get_target,localedata_en) \
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+$(eval $(call gb_Library_add_linked_libs,sc_ucalc,\
+ tubes \
+))
+endif
+
$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
avmedia \
basegfx \
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 1026d9b..adda0d2 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -41,9 +41,14 @@
#include unotools/tempfile.hxx
#include unotools/localfilehelper.hxx
#include comphelper/mediadescriptor.hxx
+#include comphelper/processfactory.hxx
+#include comphelper/componentcontext.hxx
#include com/sun/star/frame/XLoadable.hpp
+#include com/sun/star/frame/XComponentLoader.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/document/XDocumentRecovery.hpp
+#include com/sun/star/util/XCloseable.hpp
namespace css = ::com::sun::star;
@@ -308,7 +313,8 @@ IMPL_LINK( ScDocFuncRecv, ReceiveFileCallback,
rtl::OUString *, pStr )
fprintf( stderr, incoming file '%s'\n,
rtl::OUStringToOString( *pStr, RTL_TEXTENCODING_UTF8 ).getStr() );
-css::uno::Sequence css::beans::PropertyValue aLoadArgs(5);
+// using the frame::XLoadable interface fails with a
DoubleInitializationException
+/*css::uno::Sequence css::beans::PropertyValue aLoadArgs(5);
aLoadArgs[0].Name = rtl::OUString( URL );
aLoadArgs[0].Value = (*pStr);
aLoadArgs[1].Name = rtl::OUString( FilterName );
@@ -320,7 +326,6 @@ IMPL_LINK( ScDocFuncRecv, ReceiveFileCallback,
rtl::OUString *, pStr )
aLoadArgs[3].Value = sal_Int32( 3 );
aLoadArgs[4].Name = rtl::OUString( UpdateDocMode );
aLoadArgs[4].Value = sal_Int32( 2 );
-
try
{
css::uno::Reference css::frame::XLoadable xLoad(
@@ -331,6 +336,33 @@ IMPL_LINK( ScDocFuncRecv, ReceiveFileCallback,
rtl::OUString *, pStr )
{
fprintf( stderr, exception when loading '%s' !\n,
rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
+ } */
+// #2 - tried out the SfxAutoReloadTimer_Impl - shove stuff at the SID_RELOAD
slot ...
+
+// #3 - can we use the framework/inc/services/frame.hxx 's sTargetFrameName
+// magic to load into our current frame ? ... :-)
+
+css::uno::Reference css::lang::XMultiServiceFactory rFactory =
+::comphelper::getProcessServiceFactory();
+
+css::uno::Sequence css::beans::PropertyValue args(0);
+// FIXME: should this be hidden before it is synched ready ? ...
+//args[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Hidden));
+//args[0].Value = sal_True;
+try
+{
+css::uno::Reference css::frame::XComponentLoader xLoader(
+::comphelper::getProcessServiceFactory()-createInstance(
+com.sun.star.frame.Desktop ),
+css::uno::UNO_QUERY_THROW );
+css::uno::Reference css::util::XCloseable xDoc(
+xLoader-loadComponentFromURL( *pStr, _blank, 0, args ),
+css::uno::UNO_QUERY_THROW );
+}
+catch ( css::uno::Exception e )
+{
+fprintf( stderr, exception when loading '%s' !\n,
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
}
return 0;
diff --git a/tubes/README b/tubes/README
index 3f2f637..126114a 100644
--- a/tubes/README
+++ b/tubes/README
@@ -25,6 +25,24 @@ make everything service-activatable:
Otherwise, you need to make sure liboapprover and a Telepathy-enabled
LibreOffice are running.
+Status 2012-03-23:
+
+* To do interesting things with this code build and run calc thus:
+
+ SAL_LOG=1 LIBO_TUBES=slave ./soffice -calc # user one
+ SAL_LOG=1 LIBO_TUBES=master ./soffice -calc # user two
+
+ hope that a nasty race-condition doesn't occur during startup:
+which is flagged by we are supposed to handle only one channel you
+hit it: bang - just try again.
+
+ you also require only a single jabber connection enabled (in
+empathy) and to have your opponent added and approved on both sides.
+
+ Now type simple strings into cells, rename sheets, or type
+'saveme' to transfer your document
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/inc/sc.hrc|1
sc/source/ui/collab/contacts.cxx | 73 +
sc/source/ui/collab/contacts.hrc |7 +
sc/source/ui/collab/contacts.src | 218 +++
sc/source/ui/collab/sendfunc.cxx |4
6 files changed, 304 insertions(+)
New commits:
commit 0b054ef8c89aafde7d8e2aafe5835dbe954b73cf
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 23 16:57:09 2012 +
tubes: very early start of contacts dialog, in the wrong place too.
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 42fd0fd..3132603 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -336,6 +336,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/cctrl/tbinsert \
sc/source/ui/cctrl/tbzoomsliderctrl \
sc/source/ui/collab/collab \
+ sc/source/ui/collab/contacts \
sc/source/ui/collab/sendfunc \
sc/source/ui/dbgui/asciiopt \
sc/source/ui/dbgui/consdlg \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ad4649e..0651c41 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1122,6 +1122,7 @@
#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76)
#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
+#define RID_SCDLG_CONTACTS (SC_DIALOGS_START + 78)
#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79)
#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80)
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
new file mode 100644
index 000..ff3db98
--- /dev/null
+++ b/sc/source/ui/collab/contacts.cxx
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Michael Meeks michael.me...@suse.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.
+ */
+
+#include sal/config.h
+
+#include vector
+#include collab.hxx
+#include tubes/conference.hxx
+#include vcl/syswin.hxx
+#include svx/simptabl.hxx
+
+// #define CONTACTS
+
+#ifdef CONTACTS_DLG
+namespace {
+class TubeContacts : SfxModelessDialog
+{
+SvxSimpleTableContainer maListContainer;
+SvxSimpleTable maList;
+
+public:
+TubeContacts() :
+SystemWindow( WINDOW_FLOATINGWINDOW, ),
+maListContainer( this, CUI_RES( LB_JAVA ) ),
+maList( maListContainer ),
+{
+ScResId( FL_PRINTAREA ) ),
+
+ResId aResId;
+mpListContainer = new SvxSimpleTableContainer( this, aResId );
+SetMinOutputSizePixel( Size( 640, 480 ) );
+Show();
+}
+virtual ~TubeContacts() {}
+};
+} // anonymous namespace
+#endif
+
+namespace tubes {
+void createContacts()
+{
+#ifdef CONTACTS_DLG
+new TubeContacts();
+#endif
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/collab/contacts.hrc b/sc/source/ui/collab/contacts.hrc
new file mode 100644
index 000..0ee1b06
--- /dev/null
+++ b/sc/source/ui/collab/contacts.hrc
@@ -0,0 +1,7 @@
+#include sc.hrc // - RID_SCDLG_CONTACTS
+
+#define FL_LABEL 1
+#define CTL_LIST 2
+
+#define STR_HEADER_ALIAS 20
+#define STR_HEADER_FEATURES 21
diff --git a/sc/source/ui/collab/contacts.src b/sc/source/ui/collab/contacts.src
new file mode 100644
index 000..ab20c87
--- /dev/null
+++ b/sc/source/ui/collab/contacts.src
@@ -0,0 +1,218 @@
+#include sc.hrc
+#include contacts.hrc
+#include cuires.hrc
+
+ModelessDialog RID_SCDLG_CONTACTS
+{
+HelpId = HID_SCPAGE_AREAS; // has to be something ...
+OutputSize = TRUE ;
+SVLook = TRUE ;
+Hide = TRUE ;
+Moveable = TRUE ;
+Closeable = TRUE ;
+Size = MAP_APPFONT ( 320 , 480 ) ;
+Text [ en-US ] = Contacts ;
+
+FixedLine FL_LABEL
+{
+Pos = MAP_APPFONT ( 6 , 3 ) ;
+Size = MAP_APPFONT ( 400 , 8 ) ;
+Text [ en-US ] = Here are your contacts ;
+};
+Control LB_JAVA
+{
+Pos = MAP_APPFONT ( 21 , 38 ) ;
+Size
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/AllLangResTarget_sc.mk sc/source
sc/AllLangResTarget_sc.mk|1
sc/source/ui/collab/contacts.cxx | 12 +-
sc/source/ui/collab/contacts.hrc |2
sc/source/ui/collab/contacts.hxx | 39 +++
sc/source/ui/collab/contacts.src | 192 +--
5 files changed, 51 insertions(+), 195 deletions(-)
New commits:
commit 83ddef371e8977f4be411968044b7b12bb81
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 23 17:07:38 2012 +
tubes: more work on contact list and missing files
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index ab87f3d..6f6067e 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/attrdlg.src \
sc/source/ui/src/filter.src \
sc/source/ui/cctrl/checklistmenu.src \
+ sc/source/ui/collab/contacts.src \
sc/source/ui/navipi/navipi.src \
sc/source/ui/docshell/tpstat.src \
sc/source/ui/pagedlg/pagedlg.src \
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index ff3db98..d517888 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -38,21 +38,19 @@
#ifdef CONTACTS_DLG
namespace {
-class TubeContacts : SfxModelessDialog
+class TubeContacts : ModelessDialog
{
+FixedLine maLabel;
SvxSimpleTableContainer maListContainer;
SvxSimpleTable maList;
public:
TubeContacts() :
-SystemWindow( WINDOW_FLOATINGWINDOW, ),
-maListContainer( this, CUI_RES( LB_JAVA ) ),
+ModelessDialog( NULL, RID_SCDLG_CONTACTS ),
+maLabel( this, ScResId( FL_LABEL ) ),
+maListContainer( this, ScResId( CTL_LIST ) ),
maList( maListContainer ),
{
-ScResId( FL_PRINTAREA ) ),
-
-ResId aResId;
-mpListContainer = new SvxSimpleTableContainer( this, aResId );
SetMinOutputSizePixel( Size( 640, 480 ) );
Show();
}
diff --git a/sc/source/ui/collab/contacts.hrc b/sc/source/ui/collab/contacts.hrc
index 0ee1b06..c6e38d3 100644
--- a/sc/source/ui/collab/contacts.hrc
+++ b/sc/source/ui/collab/contacts.hrc
@@ -4,4 +4,4 @@
#define CTL_LIST 2
#define STR_HEADER_ALIAS 20
-#define STR_HEADER_FEATURES 21
+#define STR_HEADER_NAME 21
diff --git a/sc/source/ui/collab/contacts.hxx b/sc/source/ui/collab/contacts.hxx
new file mode 100644
index 000..657df23
--- /dev/null
+++ b/sc/source/ui/collab/contacts.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Michael Meeks michael.me...@suse.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.
+ */
+
+#include sal/config.h
+
+#include vector
+#include collab.hxx
+#include tubes/conference.hxx
+
+namespace tubes {
+void createContacts();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/collab/contacts.src b/sc/source/ui/collab/contacts.src
index ab20c87..0972920 100644
--- a/sc/source/ui/collab/contacts.src
+++ b/sc/source/ui/collab/contacts.src
@@ -1,13 +1,12 @@
#include sc.hrc
#include contacts.hrc
-#include cuires.hrc
ModelessDialog RID_SCDLG_CONTACTS
{
HelpId = HID_SCPAGE_AREAS; // has to be something ...
OutputSize = TRUE ;
SVLook = TRUE ;
-Hide = TRUE ;
+Hide = FALSE ;
Moveable = TRUE ;
Closeable = TRUE ;
Size = MAP_APPFONT ( 320 , 480 ) ;
@@ -19,7 +18,7 @@ ModelessDialog RID_SCDLG_CONTACTS
Size = MAP_APPFONT ( 400 , 8 ) ;
Text [ en-US ] = Here are your contacts ;
};
-Control LB_JAVA
+Control CTL_LIST
{
Pos = MAP_APPFONT ( 21 , 38 ) ;
Size = MAP_APPFONT ( 177 , 130 ) ;
@@ -28,191 +27,10 @@ ModelessDialog RID_SCDLG_CONTACTS
};
String STR_HEADER_ALIAS
{
-Text [ en-US ] = Vendor ;
+Text [ en-US ] = Alias ;
};
-String STR_HEADER_VERSION
+String STR_HEADER_NAME
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source tubes/inc tubes/source
sc/source/ui/collab/contacts.cxx | 66 ++-
sc/source/ui/collab/contacts.hxx |3 +
sc/source/ui/collab/contacts.src |9 ++---
sc/source/ui/collab/sendfunc.cxx |3 +
tubes/inc/tubes/manager.hxx |2 -
tubes/source/manager.cxx |2 -
6 files changed, 69 insertions(+), 16 deletions(-)
New commits:
commit 5ac3317860a84750e4962bce15da76eb3cc3c84c
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 23 17:54:06 2012 +
tubes: make the contacts list show something
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index d517888..00e0392 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -30,15 +30,20 @@
#include vector
#include collab.hxx
+#include contacts.hrc
+#include scresid.hxx
+#include tubes/manager.hxx
#include tubes/conference.hxx
-#include vcl/syswin.hxx
+#include tubes/contact-list.hxx
+#include vcl/fixed.hxx
+#include vcl/dialog.hxx
#include svx/simptabl.hxx
-// #define CONTACTS
+#define CONTACTS_DLG
#ifdef CONTACTS_DLG
namespace {
-class TubeContacts : ModelessDialog
+class TubeContacts : public ModelessDialog
{
FixedLine maLabel;
SvxSimpleTableContainer maListContainer;
@@ -46,24 +51,69 @@ class TubeContacts : ModelessDialog
public:
TubeContacts() :
-ModelessDialog( NULL, RID_SCDLG_CONTACTS ),
+ModelessDialog( NULL, ScResId( RID_SCDLG_CONTACTS ) ),
maLabel( this, ScResId( FL_LABEL ) ),
maListContainer( this, ScResId( CTL_LIST ) ),
-maList( maListContainer ),
+maList( maListContainer )
{
-SetMinOutputSizePixel( Size( 640, 480 ) );
+static long aStaticTabs[]=
+{
+3 /* count */, 0, 20, 80, 150, 200
+};
+
+maList.SvxSimpleTable::SetTabs( aStaticTabs );
+String sHeader( '\t' );
+sHeader += String( ScResId( STR_HEADER_ALIAS ) );
+sHeader += '\t';
+sHeader += String( ScResId( STR_HEADER_NAME ) );
+sHeader += '\t';
+maList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
Show();
}
virtual ~TubeContacts() {}
+
+static rtl::OUString fromUTF8( const char *pStr )
+{
+return rtl::OStringToOUString( rtl::OString( pStr, strlen( pStr ) ),
+ RTL_TEXTENCODING_UTF8 );
+}
+
+void Populate( const TeleManager rManager )
+{
+ContactList *pContacts = rManager.getContactList();
+if ( pContacts )
+{
+fprintf( stderr, contacts !\n );
+AccountContactPairV aPairs = pContacts-getContacts();
+AccountContactPairV::iterator it;
+for( it = aPairs.begin(); it != aPairs.end(); it++ )
+{
+fprintf( stderr, '%s' = '%s' '%s'\n,
+ tp_account_get_display_name( it-first ),
+ tp_contact_get_alias( it-second ),
+ tp_contact_get_identifier( it-second ) );
+rtl::OUStringBuffer aEntry( 128 );
+aEntry.append( sal_Unicode( '\t' ) );
+aEntry.append( fromUTF8 ( tp_contact_get_alias( it-second ) )
);
+aEntry.append( sal_Unicode( '\t' ) );
+aEntry.append( fromUTF8 ( tp_contact_get_identifier(
it-second ) ) );
+aEntry.append( sal_Unicode( '\t' ) );
+SvLBoxEntry* pEntry = maList.InsertEntry(
aEntry.makeStringAndClear() );
+// FIXME: ref the TpContact ...
+pEntry-SetUserData( it-second );
+}
+}
+}
};
} // anonymous namespace
#endif
namespace tubes {
-void createContacts()
+void createContacts( const TeleManager rManager )
{
#ifdef CONTACTS_DLG
-new TubeContacts();
+TubeContacts *pContacts = new TubeContacts();
+pContacts-Populate( rManager );
#endif
}
}
diff --git a/sc/source/ui/collab/contacts.hxx b/sc/source/ui/collab/contacts.hxx
index 657df23..eba76a3 100644
--- a/sc/source/ui/collab/contacts.hxx
+++ b/sc/source/ui/collab/contacts.hxx
@@ -32,8 +32,9 @@
#include collab.hxx
#include tubes/conference.hxx
+class TeleManager;
namespace tubes {
-void createContacts();
+void createContacts( const TeleManager rContacts );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/collab/contacts.src b/sc/source/ui/collab/contacts.src
index 0972920..6a1081f 100644
--- a/sc/source/ui/collab/contacts.src
+++ b/sc/source/ui/collab/contacts.src
@@ -9,19 +9,20 @@ ModelessDialog RID_SCDLG_CONTACTS
Hide = FALSE ;
Moveable = TRUE ;
Closeable = TRUE ;
-Size = MAP_APPFONT ( 320 , 480 ) ;
+Size = MAP_APPFONT ( 220 , 200 ) ;
+OutputSize = TRUE ;
Text [ en-US ] = Contacts ;
FixedLine FL_LABEL
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 400 , 8 ) ;
-Text [ en
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/collab/sendfunc.cxx | 189 ---
sc/source/ui/view/viewfunc.cxx |3
2 files changed, 156 insertions(+), 36 deletions(-)
New commits:
commit 503f0d340997c95d9077be0fec21ee07aa3d4a02
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 12:31:15 2012 +
tubes: chain noddy serialize de-serialize to partial docfunc re-impl.
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index ccc785d..0de59bf 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -27,45 +27,172 @@
*/
#include sal/config.h
+
+#include vector
+
#include cell.hxx
#include docsh.hxx
#include docfunc.hxx
namespace {
-// Ye noddy protocol !
-// method name ',' then arguments comma separated
-class ScChangeOp
+// Ye noddy mangling - needs improvement ...
+// method name ';' then arguments ; separated
+class ScChangeOpWriter
{
rtl::OUStringBuffer aMessage;
+ void appendSeparator()
+ {
+ aMessage.append( sal_Unicode( ';' ) );
+ }
public:
- ScChangeOp( const char *pName )
+
+ ScChangeOpWriter( const char *pName )
+ {
+ aMessage.appendAscii( pName );
+ appendSeparator();
+ }
+
+ void appendString( const rtl::OUString rStr )
{
-aMessage.appendAscii( pName );
-aMessage.append( sal_Unicode( ',' ) );
+ aMessage.append( rStr );
+ appendSeparator();
}
- void appendString( const ScAddress rPos )
+ void appendString( const String rStr )
{
-rtl::OUString aStr;
-rPos.Format( aStr );
-aMessage.append( aStr );
+ aMessage.append( rStr );
+ appendSeparator();
}
void appendAddress( const ScAddress rPos )
{
-(void)rPos;
+ rtl::OUString aStr;
+ rPos.Format( aStr, SCA_VALID );
+ aMessage.append( aStr );
+ appendSeparator();
+ }
+
+ void appendInt( sal_Int32 i )
+ {
+ aMessage.append( i );
+ appendSeparator();
+ }
+
+ void appendBool( sal_Bool b )
+ {
+ aMessage.appendAscii( b ? true : false );
+ appendSeparator();
+ }
+
+ rtl::OString toString()
+ {
+ return rtl::OUStringToOString( aMessage.toString(),
RTL_TEXTENCODING_UTF8 );
}
};
-class ScDocFuncIntercept : public ScDocFunc
+struct ProtocolError {
+const char *message;
+};
+
+class ScChangeOpReader {
+std::vector rtl::OString maArgs;
+
+public:
+
+ScChangeOpReader( const rtl::OString rString)
+{
+// will need to handle escaping etc.
+for (sal_Int32 n = 0; n = 0 n rString.getLength();)
+maArgs.push_back( rString.getToken( 0, ';', n ) );
+}
+~ScChangeOpReader() {}
+
+rtl::OString getMethod()
+{
+return maArgs[0];
+}
+
+size_t getArgCount() { return maArgs.size(); }
+
+rtl::OUString getString( sal_Int32 n )
+{
+if (n 0 (size_t)n getArgCount() )
+return rtl::OUString( maArgs[n].getStr(), maArgs[n].getLength(),
+ RTL_TEXTENCODING_UTF8 );
+else
+return rtl::OUString();
+}
+
+ScAddress getAddress( sal_Int32 n )
+{
+ScAddress aAddr;
+rtl::OUString aToken( getString( n ) );
+aAddr.Parse( aToken );
+return aAddr;
+}
+
+bool getBool( sal_Int32 n )
+{
+if (n 0 (size_t)n getArgCount() )
+return maArgs[n].equalsIgnoreAsciiCase( true );
+else
+return false;
+}
+};
+
+
+class ScDocFuncRecv : public ScDocFunc
{
+ScDocFunc *mpChain;
public:
-ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+// FIXME: really ScDocFunc should be an abstract base
+ScDocFuncRecv( ScDocShell rDocSh, ScDocFunc *pChain )
+: ScDocFunc( rDocSh ),
+ mpChain( pChain )
{
-fprintf( stderr, Interceptor created !\n );
+fprintf( stderr, Receiver created !\n );
}
-virtual ~ScDocFuncIntercept() {}
+virtual ~ScDocFuncRecv() {}
+
+void RecvMessage( const rtl::OString rString )
+{
+try {
+ScChangeOpReader aReader( rString );
+// FIXME: have some hash to enumeration mapping here
+if ( aReader.getMethod() == setNormalString )
+mpChain-SetNormalString( aReader.getAddress( 1 ),
aReader.getString( 2 ),
+ aReader.getBool( 3 ) );
+else
+fprintf( stderr, Error: unknown message '%s' (%d)\n,
+ rString.getStr(), (int)aReader.getArgCount() );
+} catch (const ProtocolError e) {
+fprintf( stderr, Error: protocol twisting '%s'\n, e.message );
+}
+}
+};
+
+class ScDocFuncSend : public ScDocFunc
+{
+ScDocFuncRecv *mpChain;
+
+void SendMessage( ScChangeOpWriter rOp )
+{
+fprintf( stderr, Op: '%s'\n, rOp.toString().getStr() );
+mpChain-RecvMessage( rOp.toString() );
+}
+
+public:
+// FIXME: really ScDocFunc should
[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - sc/inc sc/source
sc/inc/postit.hxx|2
sc/source/ui/collab/sendfunc.cxx | 204 ++-
sc/source/ui/inc/docfunc.hxx |2
3 files changed, 181 insertions(+), 27 deletions(-)
New commits:
commit bc05d8964c9cfeba00b21b4ba19411da2226d07c
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 17:39:25 2012 +
tubes: escape and quote strings if necessary.
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index d7a30a3..f1aec1b 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -38,13 +38,13 @@ namespace {
rtl::OUString cellToString( ScBaseCell *pCell )
{
-(void)pCell;
+(void)pCell; // FIXME: implement me
return rtl::OUString();
}
ScBaseCell *stringToCell( const rtl::OUString rString )
{
-(void)rString;
+(void)rString; // FIXME: implement me
return NULL;
}
@@ -66,20 +66,20 @@ public:
appendSeparator();
}
- void appendString( const String rStr )
+ void appendString( const rtl::OUString rStr )
{
- String aQuoted( rStr );
- if ( ScGlobal::FindUnquoted( aQuoted, sal_Unicode( '' ) ) !=
STRING_NOTFOUND )
+ if ( rStr.indexOf( sal_Unicode( '' ) ) = 0 ||
+ rStr.indexOf( sal_Unicode( ';' ) ) = 0 )
+ {
+ String aQuoted( rStr );
ScGlobal::AddQuotes( aQuoted, sal_Unicode( '' ) );
- aMessage.append( aQuoted );
+ aMessage.append( aQuoted );
+ }
+ else
+ aMessage.append( rStr );
appendSeparator();
}
- void appendString( const rtl::OUString rStr )
- {
- aMessage.append( String( rStr ) );
- }
-
void appendAddress( const ScAddress rPos )
{
rtl::OUString aStr;
@@ -124,38 +124,49 @@ public:
{
// will need to handle escaping etc.
// Surely someone else wrote this before ! [!?]
-sal_Int32 n = 0, nStart = 0;
enum {
-IN_TEXT, CHECK_QUOTE
-} eState = IN_TEXT;
+IN_TEXT, CHECK_QUOTE, FIND_LAST_QUOTE, SKIP_SEMI
+} eState = CHECK_QUOTE;
-while (n rString.getLength())
+sal_Int32 nStart = 0;
+for (sal_Int32 n = 0; n rString.getLength(); n++)
{
+if (rString[n] == '\\')
+{
+n++; // skip next char
+continue;
+}
switch (eState) {
case CHECK_QUOTE:
if (rString[n] == '')
{
-xub_StrLen nLen = ScGlobal::FindUnquoted( rString, '', n
+ 1 );
-if (nLen == STRING_NOTFOUND)
-{
-fprintf( stderr, Error: no closing '\' \n );
-nLen = rString.getLength();
-}
-maArgs.push_back( rString.copy( n + 1, nLen - n - 1 ) );
-n = nLen;
-if ( nLen rString.getLength() rString[ nLen + 1 ] )
-;
-eState = IN_TEXT;
+nStart = n + 1;
+eState = FIND_LAST_QUOTE;
break;
-} // drop through
+}
+// else drop through
case IN_TEXT:
if (rString[n] == ';')
{
-maArgs.push_back( rString.copy( nStart, n ) );
-n = nStart = n + 1;
+maArgs.push_back( rString.copy( nStart, n - nStart ) );
+nStart = n + 1;
+eState = CHECK_QUOTE;
+}
+break;
+case FIND_LAST_QUOTE:
+if (rString[n] == '')
+{
+maArgs.push_back( rString.copy( nStart, n - nStart ) );
+eState = SKIP_SEMI;
+break;
+}
+break;
+case SKIP_SEMI:
+if (rString[n] == ';')
+{
+nStart = n + 1;
eState = CHECK_QUOTE;
-} else
-n++;
+}
break;
}
}
commit 7cb8ce011729046c38837798afe0b6d96c0ff2e6
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 17:06:27 2012 +
tubes: proxy more docfunc functions, and improve escaping / parsing
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index e553c92..0237020 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -310,8 +310,6 @@ public:
void CopyFromClip(const ScNotes maNotes, ScDocument* pDoc, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, SCTAB nTab, bool
bCloneCaption);
void erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool
bForgetCaption = false);
-
-
};
//
diff --git a/sc/source/ui/collab
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/collab/sendfunc.cxx | 38 ++
sc/source/ui/inc/docfunc.hxx |3 +--
2 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 96fc7b84dd6820acd6fb59116ee69bf383bbdb80
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 19:44:44 2012 +
tubes: re-use autorecovery to serialize to a file for exchange
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index f1aec1b..9d9a10c 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -34,6 +34,14 @@
#include docsh.hxx
#include docfunc.hxx
+// new file send/recv fun ...
+#include unotools/tempfile.hxx
+#include unotools/localfilehelper.hxx
+#include comphelper/mediadescriptor.hxx
+#include com/sun/star/document/XDocumentRecovery.hpp
+
+namespace css = ::com::sun::star;
+
namespace {
rtl::OUString cellToString( ScBaseCell *pCell )
@@ -282,6 +290,32 @@ class ScDocFuncSend : public ScDocFunc
mpChain-RecvMessage( rOp.toString() );
}
+void SendFile( const rtl::OUString rURL )
+{
+(void)rURL;
+
+String aTmpPath = utl::TempFile::CreateTempName();
+aTmpPath.Append( rtl::OUString( .ods ) );
+
+rtl::OUString aFileURL;
+::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL );
+
+::comphelper::MediaDescriptor aDescriptor;
+// some issue with hyperlinks:
+aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] =
::rtl::OUString();
+try {
+css::uno::Reference css::document::XDocumentRecovery
xDocRecovery(
+rDocShell.GetBaseModel(), css::uno::UNO_QUERY_THROW);
+
+xDocRecovery-storeToRecoveryFile( aFileURL,
aDescriptor.getAsConstPropertyValueList() );
+} catch (const css::uno::Exception ex) {
+fprintf( stderr, exception foo !\n );
+}
+
+fprintf( stderr, Temp file is '%s'\n,
+ rtl::OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8
).getStr() );
+}
+
public:
// FIXME: really ScDocFunc should be an abstract base, so
// we don't need the rDocSh hack/pointer
@@ -314,6 +348,10 @@ public:
aOp.appendString( rText );
aOp.appendBool( bApi );
SendMessage( aOp );
+
+if ( rtl::OUString( rText ) == saveme )
+SendFile( rText );
+
return true; // needs some code auditing action
}
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index e47442e..1303f5e 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -57,7 +57,7 @@ struct ScCellMergeOption;
class ScDocFunc
{
-private:
+protected:
ScDocShellrDocShell;
sal_BoolAdjustRowHeight( const ScRange rRange, sal_Bool bPaint =
true );
@@ -67,7 +67,6 @@ private:
sal_Bool rCancel, sal_Bool bApi );
voidNotifyInputHandler( const ScAddress rPos );
-protected:
ScDocFunc( ScDocShell rDocSh ): rDocShell(rDocSh) {}
public:
virtual ~ScDocFunc() {}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/tubes2'
New branch 'feature/tubes2' available with the following commits: commit 0caa3fdb7280275dc4b43095ca75d22b35fd8178 Author: Eike Rathke er...@redhat.com Date: Wed Mar 21 16:10:16 2012 +0100 singleton impl commit 2062a904cf34ec1f87226348f727c145aa3d5551 Author: Will Thompson will.thomp...@collabora.co.uk Date: Wed Mar 21 12:15:35 2012 + Move tube service name definition to a header. commit d6a4b60f991721c4ff2f8c2c5798ef616c0a3ddc Author: Will Thompson will.thomp...@collabora.co.uk Date: Wed Mar 21 11:13:04 2012 + tubes: add API to find contacts with LibO tube support commit 5142866e8c991c8a7462a97105e48905786ea2ef Author: Eike Rathke er...@redhat.com Date: Tue Mar 20 20:24:33 2012 +0100 restructure things to one account manager and one connection tubes are offered and accepted now, sending/receiving works YAY! Thanks to Will Thompson from Collabora. commit 0c2a5c4ad49eb1c6ab85e9f83e3c202d932b261b Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 20 12:22:05 2012 + virtualise the ScDocFunc to allow interposing some magic commit d8e065d7f06c5deea01991744eabc4404948a095 Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 20 11:58:54 2012 + Don't instantiate ScDocFunc objects, get them from the doc-shell commit dcb565fdc3ed8eb8d90bfeb51c2cd72470a7f1be Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 19 15:29:07 2012 + expand pkg_config flags for telepathy ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - 3 commits - sc/source
sc/source/ui/docshell/docfunc.cxx | 12 -
sc/source/ui/docshell/docsh.cxx | 80 +-
sc/source/ui/inc/docfunc.hxx |4 +
sc/source/ui/inc/viewfunc.hxx |6 +-
sc/source/ui/view/cellsh3.cxx |2
sc/source/ui/view/viewfun4.cxx|8 ++-
sc/source/ui/view/viewfunc.cxx| 17 +++-
7 files changed, 109 insertions(+), 20 deletions(-)
New commits:
commit de709a5b0d0a0c774c9997fad98ce607103140a7
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 15:58:52 2012 +
dummy interception of ScFunc methods with INTERCEPT env var set.
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ab5dcd9..0485370 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2507,6 +2507,82 @@ sal_Bool ScDocShell::HasAutomaticTableName( const
String rFilter )
|| rFilter.EqualsAscii( pFilterRtf );
}
+namespace {
+
+class ScDocFuncIntercept : public ScDocFunc
+{
+public:
+ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+{
+fprintf( stderr, Interceptor created !\n );
+}
+virtual ~ScDocFuncIntercept() {}
+virtual void EnterListAction( sal_uInt16 nNameResId )
+{
+// Want to group these operations for the other side ...
+String aUndo( ScGlobal::GetRscString( nNameResId ) );
+}
+virtual void EndListAction()
+{
+}
+virtual ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
+const String rFormulaNmsp,
+const
formula::FormulaGrammar::Grammar eGrammar,
+short* pRetFormatType )
+{
+fprintf( stderr, interp. english string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::InterpretEnglishString( rPos, rText, rFormulaNmsp,
+ eGrammar, pRetFormatType );
+}
+virtual sal_Bool SetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi )
+{
+fprintf( stderr, set normal string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetNormalString( rPos, rText, bApi );
+}
+
+virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
+{
+fprintf( stderr, put cell string '%p' %d\n, pNewCell, bApi );
+return ScDocFunc::PutCell( rPos, pNewCell, bApi );
+}
+
+virtual sal_Bool PutData( const ScAddress rPos, ScEditEngineDefaulter
rEngine,
+ sal_Bool bInterpret, sal_Bool bApi )
+{
+fprintf( stderr, put data\n );
+return ScDocFunc::PutData( rPos, rEngine, bInterpret, bApi );
+}
+
+virtual sal_Bool SetCellText( const ScAddress rPos, const String rText,
+ sal_Bool bInterpret, sal_Bool bEnglish,
sal_Bool bApi,
+ const String rFormulaNmsp,
+ const formula::FormulaGrammar::Grammar
eGrammar )
+{
+fprintf( stderr, set cell text '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetCellText( rPos, rText, bInterpret, bEnglish,
bApi, rFormulaNmsp, eGrammar );
+}
+
+virtual bool ShowNote( const ScAddress rPos, bool bShow = true )
+{
+fprintf( stderr, %s note\n, bShow ? show : hide );
+return ScDocFunc::ShowNote( rPos, bShow );
+}
+};
+
+static ScDocFunc *
+createDocFunc( ScDocShell *pThis )
+{
+if (getenv (INTERCEPT))
+return new ScDocFuncIntercept( *pThis );
+else
+return new ScDocFuncDirect( *pThis );
+}
+
+} // anonymous namespace
+
ScDocShell::ScDocShell( const ScDocShell rShell ) :
SvRefBase(),
SotObject(),
@@ -2538,7 +2614,7 @@ ScDocShell::ScDocShell( const ScDocShell rShell ) :
bIsInplace = rShell.bIsInplace;
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
@@ -2585,7 +2661,7 @@ ScDocShell::ScDocShell( const sal_uInt64
i_nSfxCreationFlags ) :
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
commit 5d6ca544b4e9030be60f31583551b31c8d4c2f9a
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 15:57:35 2012 +
EnterData - remove un-necessary bRecord parameter for corner-case
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index e6be63c..9e72fac
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/docshell/docfunc.cxx | 15 ++-
sc/source/ui/docshell/docsh.cxx |2
sc/source/ui/view/viewfunc.cxx| 152 +++---
3 files changed, 41 insertions(+), 128 deletions(-)
New commits:
commit 9570147a927e5db8e3944deb8cb1045d685f59ea
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 18:21:23 2012 +
re-direct EnterData and turn it into many smaller ops.
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 5cb7c18..294dd76 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -859,12 +859,19 @@ sal_Bool ScDocFunc::PutCell( const ScAddress rPos,
ScBaseCell* pNewCell, sal_Bo
pDoc-PutCell( rPos, pNewCell );
-// wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden
-if (bUndo)
+if ( !bXMLLoading pNewCell-GetCellType() == CELLTYPE_FORMULA
!pDoc-GetAutoCalc() )
{
+ScFormulaCell *pFormCell = static_castScFormulaCell *( pNewCell );
+// calculate just the cell once and set Dirty again
+pFormCell-Interpret();
+pFormCell-SetDirtyVar();
+pDoc-PutInFormulaTree( pFormCell );
+}
+
+// wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden
+if (bUndo)
rDocShell.GetUndoManager()-AddUndoAction(
new ScUndoPutCell( rDocShell, rPos, pUndoCell, pRedoCell,
bHeight ) );
-}
if (bHeight)
AdjustRowHeight( ScRange(rPos) );
@@ -1283,7 +1290,7 @@ sal_Bool ScDocFunc::ApplyAttributes( const ScMarkData
rMark, const ScPatternAtt
sal_Bool ScDocFunc::ApplyStyle( const ScMarkData rMark, const String
rStyleName,
-sal_Bool bRecord, sal_Bool bApi )
+sal_Bool bRecord, sal_Bool bApi )
{
ScDocument* pDoc = rDocShell.GetDocument();
if ( bRecord !pDoc-IsUndoEnabled() )
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 0485370..e57c751 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2544,7 +2544,7 @@ public:
virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
{
-fprintf( stderr, put cell string '%p' %d\n, pNewCell, bApi );
+fprintf( stderr, put cell '%p' type %d %d\n, pNewCell,
pNewCell-GetCellType(), bApi );
return ScDocFunc::PutCell( rPos, pNewCell, bApi );
}
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 28600b5..6277537 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -212,7 +212,7 @@ sal_Bool ScViewFunc::TestFormatArea( SCCOL nCol, SCROW
nRow, SCTAB nTab, sal_Boo
}
void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
-sal_Bool bAttrChanged, sal_Bool bAddUndo )
+ sal_Bool bAttrChanged, sal_Bool bAddUndo )
{
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScDocument* pDoc = pDocSh-GetDocument();
@@ -226,27 +226,18 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW
nRow, SCTAB nTab,
const ScPatternAttr* pDocOld = pDoc-GetPattern( nCol, nRow, nTab );
// pDocOld is only valid till call ApplyPattern!
-ScPatternAttr* pOldPattern = NULL;
-if ( bAddUndo )
-pOldPattern = new ScPatternAttr( *pDocOld );
-
const ScStyleSheet* pSrcStyle = pSource-GetStyleSheet();
-if ( pSrcStyle pSrcStyle != pDocOld-GetStyleSheet() )
-pDoc-ApplyStyle( nCol, nRow, nTab, *pSrcStyle );
-pDoc-ApplyPattern( nCol, nRow, nTab, *pSource );
-AdjustRowHeight( nRow, nRow, sal_True );//! nicht
doppelt ?
-if ( bAddUndo )
-{
-const ScPatternAttr* pNewPattern = pDoc-GetPattern( nCol, nRow,
nTab );
+// Ho hum ... - totally untested but looks fun ! :-)
+ScRange aRange( nCol, nRow, nTab, nCol, nRow, nTab );
+ScMarkData aMark;
+aMark.SetMarkArea( aRange );
-pDocSh-GetUndoManager()-AddUndoAction(
-new ScUndoCursorAttr( pDocSh, nCol, nRow, nTab,
- pOldPattern, pNewPattern,
pSource,
- sal_True ) );
+ScDocFunc rFunc = GetViewData()-GetDocFunc();
+if ( pSrcStyle pSrcStyle != pDocOld-GetStyleSheet() )
+rFunc.ApplyStyle( aMark, pSrcStyle-GetName(), sal_True, sal_False
);
-delete pOldPattern; // copied in undo (pool)
-}
+rFunc.ApplyAttributes( aMark, *pSource, sal_True, sal_False );
}
if ( bAttrChanged ) // value entered with
number format?
@@ -359,75 +350,21 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
{
ScDocument* pDoc = GetViewData()-GetDocument
[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - tubes/inc tubes/qa tubes/source
tubes/inc/tubes/constants.h |6 ++ tubes/inc/tubes/manager.hxx | 30 ++ tubes/qa/test_manager.cxx |8 +++- tubes/source/contact-list.cxx |3 ++- tubes/source/manager.cxx | 37 ++--- 5 files changed, 55 insertions(+), 29 deletions(-) New commits: commit 786b18fe7e6038797fcb4812add78e4888913f5b Author: Eike Rathke er...@redhat.com Date: Wed Mar 21 16:41:34 2012 +0100 removed trailing whitespace diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 6376ca0..7f325c3 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -125,7 +125,7 @@ public: voidacceptTube( TpChannel* pChannel, const char* pAddress ); /** Send data to all registered conferences. - + @returns to how many conferences the packet was send */ sal_uInt32 sendPacket( const TelePacket rPacket ) const; diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 1ce78dd..796e986 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -742,7 +742,7 @@ rtl::OString TeleManager::createUuid() } aBuf[32] = 0; return rtl::OString( aBuf); -} +} // static commit 8536137020fa3ab9b48e12de2e0dc5c65808186a Author: Eike Rathke er...@redhat.com Date: Wed Mar 21 19:31:50 2012 +0100 make service name configurable for tests diff --git a/tubes/inc/tubes/constants.h b/tubes/inc/tubes/constants.h index 6087115..447910e 100644 --- a/tubes/inc/tubes/constants.h +++ b/tubes/inc/tubes/constants.h @@ -39,13 +39,11 @@ * etc. This does not need to include the org.freedesktop.Telepathy.Client * stuff. */ -#define LIBO_DTUBE_SERVICE \ -TP_CLIENT_BUS_NAME_BASE LibreOfficeTeleTest +#define LIBO_DTUBE_SERVICE org.libreoffice.calc /* Client name suffix, for passing as 'name' to * tp_simple_handler_new_with_am(). */ -#define LIBO_CLIENT_SUFFIX \ -LibreOffice +#define LIBO_CLIENT_SUFFIX LibreOffice #endif // INCLUDED_TUBES_CONSTANTS_H diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index decd548..6376ca0 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -140,12 +140,6 @@ public: */ boolpopPacket( TelePacket rPacket ); -/// org.freedesktop.Telepathy.Client.LibreOfficeWhatEver -rtl::OStringgetFullServiceName() const; - -/// /org/freedesktop/Telepathy/Client/LibreOfficeWhatEver -rtl::OStringgetFullObjectPath() const; - /// Only for use with MainLoopFlusher GMainLoop* getMainLoop() const; @@ -181,9 +175,28 @@ public: /** Iterate our GMainLoop, non-blocking, until nothing pending. */ voidflushLoop() const; +/// LibreOfficeWhatEver +static rtl::OString getFullClientName(); + +/// org.libreoffice.calcWhatEver +static rtl::OString getFullServiceName(); + +/// /org/libreoffice/calcWhatEver +static rtl::OString getFullObjectPath(); + +/** Add a suffix to the client name and DBus tube names, e.g. WhatEver + +Normally the client name is LibreOffice and the DBus tube service name +is something like org.libreoffice.calc, this modifies the names to +LibreOffice+pName and org.libreoffice.calc+pName to make tests not +interfere with the real world. This is not to be used otherwise. If +used it must be called before the first TeleManager is instanciated and +connects. + */ +static void addSuffixToNames( const char* pName ); + private: -rtl::OStringmaService; // the WhatEver part TeleConferenceVectormaConferences; boolmbChannelReadyHandlerInvoked : 1; @@ -192,6 +205,7 @@ private: static TeleManagerImpl* pImpl; static sal_uInt32 nRefCount; +static rtl::OString aNameSuffix; friend class TeleManagerImpl; // access to mutex diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index 3618f6c..69266d0 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -46,11 +46,11 @@ public: TestTeleTubes(); ~TestTeleTubes(); -void testContactList(); void testSetupManager1(); void testSetupManager2(); void testConnect1(); void testConnect2(); +void testContactList(); void testPrepareAccountManager1(); void testPrepareAccountManager2(); void testStartBuddySession1(); @@ -66,11 +66,11 @@ public: // Order is significant. CPPUNIT_TEST_SUITE( TestTeleTubes ); -CPPUNIT_TEST( testContactList ); CPPUNIT_TEST( testSetupManager1 ); CPPUNIT_TEST( testSetupManager2 ); CPPUNIT_TEST( testConnect1 ); CPPUNIT_TEST( testConnect2 ); +CPPUNIT_TEST( testContactList ); CPPUNIT_TEST( testPrepareAccountManager1 );
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/source/ui/collab/sendfunc.cxx | 134 +++
sc/source/ui/docshell/docsh.cxx | 80 ---
sc/source/ui/inc/docsh.hxx |2
4 files changed, 139 insertions(+), 78 deletions(-)
New commits:
commit 7cd15beb86a11bc5721436b8441cc4cff7e50ef5
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 19:06:35 2012 +
split ScDocFunc interceptor to new collab/ module and start on it
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 3856a08..a3554ce 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -313,6 +313,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/cctrl/popmenu \
sc/source/ui/cctrl/tbinsert \
sc/source/ui/cctrl/tbzoomsliderctrl \
+ sc/source/ui/collab/sendfunc \
sc/source/ui/dbgui/asciiopt \
sc/source/ui/dbgui/consdlg \
sc/source/ui/dbgui/csvcontrol \
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
new file mode 100644
index 000..ccc785d
--- /dev/null
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Michael Meeks michael.me...@suse.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.
+ */
+
+#include sal/config.h
+#include cell.hxx
+#include docsh.hxx
+#include docfunc.hxx
+
+namespace {
+
+// Ye noddy protocol !
+// method name ',' then arguments comma separated
+class ScChangeOp
+{
+ rtl::OUStringBuffer aMessage;
+public:
+ ScChangeOp( const char *pName )
+ {
+aMessage.appendAscii( pName );
+aMessage.append( sal_Unicode( ',' ) );
+ }
+
+ void appendString( const ScAddress rPos )
+ {
+rtl::OUString aStr;
+rPos.Format( aStr );
+aMessage.append( aStr );
+ }
+
+ void appendAddress( const ScAddress rPos )
+ {
+(void)rPos;
+ }
+};
+
+class ScDocFuncIntercept : public ScDocFunc
+{
+public:
+ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+{
+fprintf( stderr, Interceptor created !\n );
+}
+virtual ~ScDocFuncIntercept() {}
+virtual void EnterListAction( sal_uInt16 nNameResId )
+{
+// Want to group these operations for the other side ...
+String aUndo( ScGlobal::GetRscString( nNameResId ) );
+}
+virtual void EndListAction()
+{
+}
+virtual ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
+const String rFormulaNmsp,
+const
formula::FormulaGrammar::Grammar eGrammar,
+short* pRetFormatType )
+{
+fprintf( stderr, interp. english string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::InterpretEnglishString( rPos, rText, rFormulaNmsp,
+ eGrammar, pRetFormatType );
+}
+virtual sal_Bool SetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi )
+{
+fprintf( stderr, set normal string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetNormalString( rPos, rText, bApi );
+}
+
+virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
+{
+fprintf( stderr, put cell '%p' type %d %d\n, pNewCell,
pNewCell-GetCellType(), bApi );
+return ScDocFunc::PutCell( rPos, pNewCell, bApi );
+}
+
+virtual sal_Bool PutData( const ScAddress rPos, ScEditEngineDefaulter
rEngine,
+ sal_Bool bInterpret, sal_Bool bApi )
+{
+fprintf( stderr, put data\n );
+return ScDocFunc::PutData( rPos, rEngine, bInterpret, bApi );
+}
+
+virtual sal_Bool SetCellText( const ScAddress rPos
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source
sc/source/ui/docshell/docsh.cxx |4
sc/source/ui/inc/docfunc.hxx | 251 ---
sc/source/ui/unoobj/cellsuno.cxx |6
3 files changed, 135 insertions(+), 126 deletions(-)
New commits:
commit 7bc643779225cce42cfe99aea730b5ec7c9f0bd1
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 20 12:22:05 2012 +
virtualise the ScDocFunc to allow interposing some magic
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 88bad72..ab5dcd9 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2538,7 +2538,7 @@ ScDocShell::ScDocShell( const ScDocShell rShell ) :
bIsInplace = rShell.bIsInplace;
-pDocFunc = new ScDocFunc(*this);
+pDocFunc = new ScDocFuncDirect(*this);
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
@@ -2585,7 +2585,7 @@ ScDocShell::ScDocShell( const sal_uInt64
i_nSfxCreationFlags ) :
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
-pDocFunc = new ScDocFunc(*this);
+pDocFunc = new ScDocFuncDirect(*this);
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index a2e6fd2..e7f6b4d 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -60,147 +60,156 @@ class ScDocFunc
private:
ScDocShellrDocShell;
-sal_BoolAdjustRowHeight( const ScRange rRange, sal_Bool
bPaint = true );
+sal_BoolAdjustRowHeight( const ScRange rRange, sal_Bool bPaint =
true );
voidCreateOneName( ScRangeName rList,
SCCOL nPosX, SCROW nPosY, SCTAB nTab,
SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
sal_Bool rCancel, sal_Bool bApi );
voidNotifyInputHandler( const ScAddress rPos );
+protected:
+ScDocFunc( ScDocShell rDocSh ): rDocShell(rDocSh) {}
public:
-ScDocFunc( ScDocShell rDocSh ): rDocShell(rDocSh) {}
-~ScDocFunc() {}
+virtual ~ScDocFunc() {}
DECL_LINK( NotifyDrawUndo, SdrUndoAction* );
-sal_BoolDetectiveAddPred(const ScAddress rPos);
-sal_BoolDetectiveDelPred(const ScAddress rPos);
-sal_BoolDetectiveAddSucc(const ScAddress rPos);
-sal_BoolDetectiveDelSucc(const ScAddress rPos);
-sal_BoolDetectiveAddError(const ScAddress rPos);
-sal_BoolDetectiveMarkInvalid(SCTAB nTab);
-sal_BoolDetectiveDelAll(SCTAB nTab);
-sal_BoolDetectiveRefresh(sal_Bool bAutomatic = false);
-voidDetectiveCollectAllPreds(const ScRangeList rSrcRanges,
::std::vectorScTokenRef rRefTokens);
-voidDetectiveCollectAllSuccs(const ScRangeList rSrcRanges,
::std::vectorScTokenRef rRefTokens);
-
-sal_BoolDeleteContents( const ScMarkData rMark, sal_uInt16
nFlags,
-sal_Bool bRecord, sal_Bool bApi );
-
-sal_BoolTransliterateText( const ScMarkData rMark, sal_Int32
nType,
-sal_Bool bRecord, sal_Bool bApi );
-
-sal_BoolSetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi );
-sal_BoolPutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi );
-sal_BoolPutData( const ScAddress rPos, ScEditEngineDefaulter
rEngine,
-sal_Bool bInterpret, sal_Bool bApi );
-sal_BoolSetCellText( const ScAddress rPos, const String
rText,
-sal_Bool bInterpret, sal_Bool bEnglish,
sal_Bool bApi,
-const String rFormulaNmsp,
-const formula::FormulaGrammar::Grammar
eGrammar );
-
-// creates a new cell for use with PutCell
-ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
-const String rFormulaNmsp, const
formula::FormulaGrammar::Grammar eGrammar,
-short* pRetFormatType = NULL );
-
-boolShowNote( const ScAddress rPos, bool bShow = true );
-inline bool HideNote( const ScAddress rPos ) { return ShowNote( rPos,
false ); }
-
-boolSetNoteText( const ScAddress rPos, const String
rNoteText, sal_Bool bApi );
-boolReplaceNote( const ScAddress rPos, const String
rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi );
-
-sal_BoolApplyAttributes( const ScMarkData rMark, const
ScPatternAttr rPattern,
-sal_Bool bRecord, sal_Bool bApi
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source
sc/source/ui/docshell/docsh.cxx | 66 ++--
1 file changed, 64 insertions(+), 2 deletions(-)
New commits:
commit 5608a20ce5d526634641112fed77a9a805e9e27c
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 20 14:26:37 2012 +
dummy interception of ScFunc methods with INTERCEPT env var set.
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ab5dcd9..0bf22e3 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2507,6 +2507,68 @@ sal_Bool ScDocShell::HasAutomaticTableName( const
String rFilter )
|| rFilter.EqualsAscii( pFilterRtf );
}
+namespace {
+
+class ScDocFuncIntercept : public ScDocFunc
+{
+public:
+ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+{
+fprintf( stderr, Interceptor created !\n );
+}
+virtual ~ScDocFuncIntercept() {}
+virtual ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
+const String rFormulaNmsp,
+const
formula::FormulaGrammar::Grammar eGrammar,
+short* pRetFormatType )
+{
+fprintf( stderr, interp. english string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::InterpretEnglishString( rPos, rText, rFormulaNmsp,
+ eGrammar, pRetFormatType );
+}
+virtual sal_Bool SetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi )
+{
+fprintf( stderr, set normal string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetNormalString( rPos, rText, bApi );
+}
+
+virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
+{
+fprintf( stderr, put cell string '%p' %d\n, pNewCell, bApi );
+// rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::PutCell( rPos, pNewCell, bApi );
+}
+
+virtual sal_Bool SetCellText( const ScAddress rPos, const String rText,
+ sal_Bool bInterpret, sal_Bool bEnglish,
sal_Bool bApi,
+ const String rFormulaNmsp,
+ const formula::FormulaGrammar::Grammar
eGrammar )
+{
+fprintf( stderr, set cell text '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetCellText( rPos, rText, bInterpret, bEnglish,
bApi, rFormulaNmsp, eGrammar );
+}
+
+virtual bool ShowNote( const ScAddress rPos, bool bShow = true )
+{
+fprintf( stderr, %s note\n, bShow ? show : hide );
+return ScDocFunc::ShowNote( rPos, bShow );
+}
+};
+
+static ScDocFunc *
+createDocFunc( ScDocShell *pThis )
+{
+if (getenv (INTERCEPT))
+return new ScDocFuncIntercept( *pThis );
+else
+return new ScDocFuncDirect( *pThis );
+}
+
+} // anonymous namespace
+
ScDocShell::ScDocShell( const ScDocShell rShell ) :
SvRefBase(),
SotObject(),
@@ -2538,7 +2600,7 @@ ScDocShell::ScDocShell( const ScDocShell rShell ) :
bIsInplace = rShell.bIsInplace;
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
@@ -2585,7 +2647,7 @@ ScDocShell::ScDocShell( const sal_uInt64
i_nSfxCreationFlags ) :
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source
sc/source/ui/docshell/docfunc.cxx | 376 +-
sc/source/ui/docshell/docsh.cxx | 17 +
sc/source/ui/inc/docfunc.hxx |5
sc/source/ui/view/viewfunc.cxx| 374 +
4 files changed, 405 insertions(+), 367 deletions(-)
New commits:
commit 2aeebf9060935101e2613da982ed7aed07ea83ed
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 20 19:02:01 2012 +
Horribly mangle the ScDocFunc to create a monster
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 973968d..227d6f4 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -100,6 +100,8 @@
#include clipparam.hxx
#include externalrefmgr.hxx
#include undorangename.hxx
+#include funcdesc.hxx
+#include docuno.hxx
#include memory
#include basic/basmgr.hxx
@@ -3770,6 +3772,378 @@ bool ScDocFunc::AutoFormat( const ScRange rRange,
const ScMarkData* pTabMark,
//
+#ifndef LRU_MAX
+#define LRU_MAX 10
+#endif
+
+/*
+ * FIXME: this function detection / auto-entry code should be
+ * pushed up back into the view before this goes to master !
+ */
+
+sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode )
+{
+const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
+if ( pFuncList )
+{
+sal_uLong nCount = pFuncList-GetCount();
+for (sal_uLong i=0; inCount; i++)
+if ( pFuncList-GetFunction(i)-nFIndex == nOpCode )
+return sal_True;
+}
+return false;
+}
+
+sal_Bool lcl_AddFunction( ScAppOptions rAppOpt, sal_uInt16 nOpCode )
+{
+sal_uInt16 nOldCount = rAppOpt.GetLRUFuncListCount();
+sal_uInt16* pOldList = rAppOpt.GetLRUFuncList();
+sal_uInt16 nPos;
+for (nPos=0; nPosnOldCount; nPos++)
+if (pOldList[nPos] == nOpCode) // is the function already in
the list?
+{
+if ( nPos == 0 )
+return false; // already at the top - no
change
+
+// count doesn't change, so the original array is modified
+
+for (sal_uInt16 nCopy=nPos; nCopy0; nCopy--)
+pOldList[nCopy] = pOldList[nCopy-1];
+pOldList[0] = nOpCode;
+
+return sal_True;// list has changed
+}
+
+if ( !lcl_FunctionKnown( nOpCode ) )
+return false; // not in function list - no
change
+
+sal_uInt16 nNewCount = Min( (sal_uInt16)(nOldCount + 1),
(sal_uInt16)LRU_MAX );
+sal_uInt16 nNewList[LRU_MAX];
+nNewList[0] = nOpCode;
+for (nPos=1; nPosnNewCount; nPos++)
+nNewList[nPos] = pOldList[nPos-1];
+rAppOpt.SetLRUFuncList( nNewList, nNewCount );
+
+return sal_True;// list has changed
+}
+
+/**
+ * Enter user data across marked tabs at given row / column
+ *
+ * FIXME: this -badly- needs decomposing into some sane series
+ *of smaller operations.
+ */
+void ScDocFunc::EnterUserDataTabs( SCCOL nCol, SCROW nRow, SCTAB nTab,
+ const ScMarkData rMark,
+ const String rString,
+ sal_Bool bRecord, const EditTextObject*
pData )
+{
+ScDocShellModificator aModificator( rDocShell );
+
+SCTAB nSelCount = rMark.GetSelectCount();
+SCTAB i;
+sal_Bool bEditDeleted = false;
+sal_uInt8 nOldScript = 0;
+ScDocument* pDoc = rDocShell.GetDocument();
+
+ScBaseCell** ppOldCells = NULL;
+sal_Bool* pHasFormat= NULL;
+sal_uLong* pOldFormats = NULL;
+SCTAB* pTabs= NULL;
+SCTAB nUndoPos = 0;
+EditTextObject* pUndoData = NULL;
+if ( bRecord )
+{
+ppOldCells = new ScBaseCell*[nSelCount];
+pHasFormat = new sal_Bool[nSelCount];
+pOldFormats = new sal_uLong[nSelCount];
+pTabs = new SCTAB[nSelCount];
+nUndoPos = 0;
+
+ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
+for (; itr != itrEnd; ++itr)
+{
+i = *itr;
+pTabs[nUndoPos] = i;
+ScBaseCell* pDocCell;
+pDoc-GetCell( nCol, nRow, i, pDocCell );
+if ( pDocCell )
+{
+ppOldCells[nUndoPos] = pDocCell-Clone( *pDoc );
+if ( pDocCell-GetCellType() == CELLTYPE_EDIT )
+bEditDeleted = sal_True;
+
+sal_uInt8 nDocScript = pDoc-GetScriptType( nCol, nRow, i,
pDocCell );
+if ( nOldScript == 0 )
+nOldScript = nDocScript;
+else if ( nDocScript != nOldScript )
+bEditDeleted = sal_True;
+}
+else
+ppOldCells[nUndoPos] = NULL;
+
+const SfxPoolItem* pItem;
+const ScPatternAttr
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source
svtools/source/misc/templatefoldercache.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit ec752de623f4f7c7e297422730f193034e21f93f
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 16 14:57:51 2012 +0100
fdo#37593 Make sure needsUpdate compares canonicalized paths
...so that it does not erroneously always claim an update is needed, so that
SvtDocumentTemplateDialog::UpdateHdl_Impl does not always jump back to
OpenTemplateRoot() shortly after opening the dialog (and thus jumps away
from
the last remembered folder).
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index 41f0af0..d5325f4 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -695,6 +695,17 @@ namespace svt
{
String sTemplatePath( aDirs.GetToken( i, ';' ) );
sTemplatePath = aPathOptions.ExpandMacros( sTemplatePath );
+
+// Make sure excess .. path segments (from expanding bootstrap
+// variables in paths) are normalized in the same way they are
+// normalized for paths read from the .templdir.cache file (where
+// paths have gone through makeRelocatable URL on writing out and
+// then through makeAbsoluteURL when reading back in), as otherwise
+// equalStates() in needsUpdate() could erroneously consider
+// m_aCurrentState and m_aPreviousState as different:
+sTemplatePath = getOfficeInstDirs()-makeAbsoluteURL(
+getOfficeInstDirs()-makeRelocatableURL(sTemplatePath));
+
// create a new entry
m_aCurrentState.push_back( new TemplateContent( INetURLObject(
sTemplatePath ) ) );
TemplateFolderContent::iterator aCurrentRoot =
m_aCurrentState.end();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - readlicense_oo/html readlicense_oo/odt readlicense_oo/txt
readlicense_oo/html/THIRDPARTYLICENSEREADME.html | 65 +++ readlicense_oo/odt/LICENSE.odt |binary readlicense_oo/txt/license.txt | 65 +++ 3 files changed, 130 insertions(+) New commits: commit b234cf6e5478120bc1e8c66b2b91de0387774b0c Author: Andras Timar ati...@suse.com Date: Sun Mar 18 11:47:27 2012 +0100 update of license document added Info-ZIP lincense Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html index 45a5c27..d9c29b7 100644 --- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html +++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html @@ -2611,6 +2611,71 @@ be misrepresented as being the original software./P P CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm3. This notice may not be removed or altered from any source distribution./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +LibreOffice uses unzip.c from zlib's contrib/minizip directory. This file +was derived from Info-ZIP's unzip.c, which is under the Info-ZIP License:/P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +This is version 2007-Mar-4 of the Info-ZIP license. +The definitive version of this document should be available at +a href=ftp://ftp.info-zip.org/pub/infozip/license.html;ftp://ftp.info-zip.org/pub/infozip/license.html/a indefinitely and +a copy at a href=http://www.info-zip.org/pub/infozip/license.html;http://www.info-zip.org/pub/infozip/license.html/a./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Copyright (c) 1990-2007 Info-ZIP. All rights reserved./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +For the purposes of this copyright and license, Info-ZIP is defined as +the following set of individuals:/P +BLOCKQUOTEP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, +Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth, +Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, +David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, +Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, +Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda, +Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren, +Rich Wales, Mike White./P/BLOCKQUOTE +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +This software is provided as is, without warranty of any kind, express +or implied. In no event shall Info-ZIP or its contributors be held liable +for any direct, indirect, incidental, special or consequential damages +arising out of the use of or inability to use this software./P +P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the above disclaimer and the following restrictions:/P +OL +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Redistributions of source code (in whole or in part) must retain +the above copyright notice, definition, disclaimer, and this list +of conditions./P/LI +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Redistributions in binary form (compiled executables and libraries) +must reproduce the above copyright notice, definition, disclaimer, +and this list of conditions in documentation and/or other materials +provided with the distribution. The sole exception to this condition +is redistribution of a standard UnZipSFX binary (including SFXWiz) as +part of a self-extracting archive; that is permitted without inclusion +of this license, as long as the normal SFX banner has not been removed +from the binary or disabled./P/LI +LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 0.3cm +Altered versions--including, but not limited to, ports to new operating +systems, existing ports with new graphical interfaces, versions with +modified or added functionality, and dynamic, shared, or static library +versions not from Info-ZIP--must be plainly marked as such and must not +be misrepresented as being the original source or, if binaries, +compiled from the original source. Such altered versions also must not +be misrepresented as being Info-ZIP releases--including, but not +limited to, labeling of the altered versions with the names Info-ZIP +(or any variation thereof, including, but not limited to, different +capitalizations), Pocket UnZip, WiZ or MacZip without the +explicit permission of Info-ZIP. Such altered versions are further +prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP +e-mail
[Libreoffice-commits] .: Branch 'feature/tubes' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1275695fc77fccf9c82467e218f75017693f1d0 Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 19 15:29:07 2012 + expand pkg_config flags for telepathy diff --git a/configure.in b/configure.in index ff2c3b3..418e751 100644 --- a/configure.in +++ b/configure.in @@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support]) if test $_os != WINNT -a $_os != Darwin -a $enable_telepathy = yes; then ENABLE_TELEPATHY=TRUE AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 ) +PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 dbus-1 dbus-1-glib ) else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbd5bd87ee8823eed55e2ddce766b86d7a9f4ecd Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 19 15:35:35 2012 + and get the pkg_config package name right diff --git a/configure.in b/configure.in index 418e751..af324fc 100644 --- a/configure.in +++ b/configure.in @@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support]) if test $_os != WINNT -a $_os != Darwin -a $enable_telepathy = yes; then ENABLE_TELEPATHY=TRUE AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 dbus-1 dbus-1-glib ) +PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 dbus-1 dbus-glib-1 ) else AC_MSG_RESULT([no]) fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/Library_sw.mk
sw/Library_sw.mk |1 - 1 file changed, 1 deletion(-) New commits: commit a3ace305bcbd0bf04badddff8ef6273287f30556 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Mar 16 18:07:36 2012 +0100 sw doesn't need to link oox that commit should have been cleaned up before it went upstream Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 40e70f3..9529470 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -63,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\ i18nisolang1 \ i18nutil \ lng \ -oox \ sal \ salhelper \ sax \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configmgr/source
configmgr/source/components.cxx | 40 +++-
1 file changed, 31 insertions(+), 9 deletions(-)
New commits:
commit 4f78696117ebe4f729880b5d9bfc2f5817b73543
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 15 09:34:56 2012 +0100
fdo#42961 Don't let env vars interfere with internal bootstrap vars
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 48d555e..a341d84 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -54,6 +54,7 @@
#include rtl/oustringostreaminserter.hxx
#include rtl/ref.hxx
#include rtl/string.h
+#include rtl/ustrbuf.hxx
#include rtl/ustring.h
#include rtl/ustring.hxx
#include rtl/instance.hxx
@@ -838,17 +839,38 @@ void Components::parseXcsXcuLayer(int layer,
rtl::OUString const url) {
void Components::parseXcsXcuIniLayer(
int layer, rtl::OUString const url, bool recordAdditions)
{
-//TODO: rtl::Bootstrap::getFrom first trie[s] to retrieve the value via
the
-// global function
+// Check if ini file exists (otherwise .override would still read global
+// SCHEMA/DATA variables, which could interfere with unrelated environment
+// variables):
rtl::Bootstrap ini(url);
-rtl::OUString urls;
-if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCHEMA)),
urls))
+if (ini.getHandle() != 0)
{
-parseFileList(layer, parseXcsFile, urls, ini, false);
-}
-if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DATA)), urls))
-{
-parseFileList(layer + 1, parseXcuFile, urls, ini, recordAdditions);
+rtl::OUStringBuffer prefix(${.override:);
+for (sal_Int32 i = 0; i != url.getLength(); ++i) {
+sal_Unicode c = url[i];
+switch (c) {
+case '$':
+case ':':
+case '\\':
+prefix.append('\\');
+// fall through
+default:
+prefix.append(c);
+}
+}
+prefix.append(':');
+rtl::OUString urls(prefix.toString() + rtl::OUString(SCHEMA}));
+rtl::Bootstrap::expandMacros(urls);
+if (!urls.isEmpty())
+{
+parseFileList(layer, parseXcsFile, urls, ini, false);
+}
+urls = prefix.makeStringAndClear() + rtl::OUString(DATA});
+rtl::Bootstrap::expandMacros(urls);
+if (!urls.isEmpty())
+{
+parseFileList(layer + 1, parseXcuFile, urls, ini,
recordAdditions);
+}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic vcl/headless vcl/inc
vcl/generic/print/common_gfx.cxx |3 -
vcl/generic/print/genprnpsp.cxx | 36 ---
vcl/generic/print/printerjob.cxx | 89 ---
vcl/generic/print/text_gfx.cxx | 42 --
vcl/headless/svpprn.cxx | 11
vcl/inc/generic/printergfx.hxx |3 -
6 files changed, 2 insertions(+), 182 deletions(-)
New commits:
commit 230854bad461dbfa2aa72269c2468ff380b789a8
Author: Christina Rossmanith chrrossman...@web.de
Date: Mon Mar 5 14:57:30 2012 +0100
Remove SO52 strict compatibility stuff
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 941a5cc..44bf1a7 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -129,8 +129,7 @@ PrinterGfx::PrinterGfx() :
maFillColor (0xff,0,0),
maTextColor (0,0,0),
maLineColor (0, 0xff, 0),
-mpFontSubstitutes( NULL ),
-mbStrictSO52Compatibility( false )
+mpFontSubstitutes( NULL )
{
maVirtualStatus.mfLineWidth = 1.0;
maVirtualStatus.mnTextHeight = 12;
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 54cb87c..6525f96 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -413,18 +413,6 @@ void
SalGenericInstance::configurePspInfoPrinter(PspSalInfoPrinter *pPrinter,
pJobSetup-maPrinterName= pQueueInfo-maPrinterName;
pJobSetup-maDriver = aInfo.m_aDriverName;
copyJobDataToJobSetup( pJobSetup, aInfo );
-
-// set/clear backwards compatibility flag
-bool bStrictSO52Compatibility = false;
-boost::unordered_maprtl::OUString, rtl::OUString, rtl::OUStringHash
::const_iterator compat_it =
-pJobSetup-maValueMap.find( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( StrictSO52Compatibility ) ) );
-
-if( compat_it != pJobSetup-maValueMap.end() )
-{
-if(
compat_it-second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(true))
)
-bStrictSO52Compatibility = true;
-}
-pPrinter-m_aPrinterGfx.setStrictSO52Compatibility(
bStrictSO52Compatibility );
}
}
@@ -627,18 +615,6 @@ sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame,
ImplJobSetup* pJobSetup )
// should be merged into the independent data
sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
{
-// set/clear backwards compatibility flag
-bool bStrictSO52Compatibility = false;
-boost::unordered_maprtl::OUString, rtl::OUString, rtl::OUStringHash
::const_iterator compat_it =
-pJobSetup-maValueMap.find( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( StrictSO52Compatibility ) ) );
-
-if( compat_it != pJobSetup-maValueMap.end() )
-{
-if(
compat_it-second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(true))
)
-bStrictSO52Compatibility = true;
-}
-m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
-
if( pJobSetup-mpDriverData )
return SetData( ~0, pJobSetup );
@@ -991,18 +967,6 @@ sal_Bool PspSalPrinter::StartJob(
#endif
m_aPrinterGfx.Init( m_aJobData );
-// set/clear backwards compatibility flag
-bool bStrictSO52Compatibility = false;
-boost::unordered_maprtl::OUString, rtl::OUString, rtl::OUStringHash
::const_iterator compat_it =
-pJobSetup-maValueMap.find( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( StrictSO52Compatibility ) ) );
-
-if( compat_it != pJobSetup-maValueMap.end() )
-{
-if(
compat_it-second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(true))
)
-bStrictSO52Compatibility = true;
-}
-m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
-
return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile :
m_aFileName, nMode, rJobName, rAppName, m_aJobData, m_aPrinterGfx, bDirect ) ?
sal_True : sal_False;
}
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 503d7af..4cf9efc 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -977,94 +977,7 @@ bool PrinterJob::writeProlog (osl::File* pFile, const
JobData rJobData )
%%EndResource\n
%%EndProlog\n
};
-static const sal_Char pSO52CompatProlog[] = {
-%%BeginResource: procset PSPrint-Prolog 1.0 0\n
-/ISO1252Encoding [\n
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef\n
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef\n
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef\n
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef\n
-/space /exclam /quotedbl /numbersign /dollar /percent /ampersand
/quoteright\n
-/parenleft /parenright /asterisk /plus /comma /minus /period /slash\n
-/zero /one /two
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/layout/tabfrm.cxx | 322 ++-
1 file changed, 153 insertions(+), 169 deletions(-)
New commits:
commit 5002b28979aae63de5c92d990e9f1520e178b1be
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 13 13:58:46 2012 +
trailing whitespace cleanup
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 40c949f..6e5c32a 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1995,7 +1995,7 @@ void SwTabFrm::MakeAll()
}
}
-//We need to know the height of the first row, because the master
needs
+//We need to know the height of the first row, because the master needs
//to be activated if it shrinks and then absorb the row if necessary.
long n1StLineHeight = 0;
if ( IsFollow() )
@@ -2786,7 +2786,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
}
//VarSize is always the height.
-//For the upper/lower border the same rules apply as for cntfrms (see
+//For the upper/lower border the same rules apply as for cntfrms (see
//MakePrtArea() of those).
SwTwips nUpper = CalcUpperSpace( pAttrs );
@@ -4566,7 +4566,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool
bTst, sal_Bool bInfo )
SwTwips nTmp = GetUpper()-Shrink( nReal, bTst );
if ( !bShrinkAnyway !GetNext() nTmp != nReal )
{
-//The last one gets the leftover in the upper and therefore takes
+//The last one gets the leftover in the upper and therefore takes
//care (otherwise: endless loop)
if ( !bTst )
{
commit 50337941b9a3bfa0890ffc9da6f97a54548af896
Author: Nicolas Christener nicolas.christe...@adfinis-sygroup.ch
Date: Thu Mar 8 20:37:40 2012 +0100
translate german comments
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 95eceb8..40c949f 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -96,10 +96,10 @@ SwTabFrm::SwTabFrm( SwTable rTab, SwFrm* pSib ):
// #i26945#
bConsiderObjsForMinCellHeight = sal_True;
bObjsDoesFit = sal_True;
-bFixSize = sal_False; //Nicht nochmal auf die Importfilter
hereinfallen.
+bFixSize = sal_False; //Don't fall for import filter again.
nType = FRMC_TAB;
-//Gleich die Zeilen erzeugen und einfuegen.
+//Create the lines and insert them.
const SwTableLines rLines = rTab.GetTabLines();
SwFrm *pTmpPrev = 0;
for ( sal_uInt16 i = 0; i rLines.Count(); ++i )
@@ -127,7 +127,7 @@ SwTabFrm::SwTabFrm( SwTabFrm rTab ) :
// #i26945#
bConsiderObjsForMinCellHeight = sal_True;
bObjsDoesFit = sal_True;
-bFixSize = sal_False; //Nicht nochmal auf die Importfilter
hereinfallen.
+bFixSize = sal_False; //Don't fall for import filter again.
nType = FRMC_TAB;
SetFollow( rTab.GetFollow() );
@@ -180,7 +180,7 @@ void SwTabFrm::JoinAndDelFollows()
|*/
void SwTabFrm::RegistFlys()
{
-OSL_ENSURE( Lower() Lower()-IsRowFrm(), Keine Zeilen. );
+OSL_ENSURE( Lower() Lower()-IsRowFrm(), No rows. );
SwPageFrm *pPage = FindPageFrm();
if ( pPage )
@@ -432,7 +432,7 @@ void lcl_MoveRowContent( SwRowFrm rSourceLine, SwRowFrm
rDestLine )
while ( pTmpDestRow-GetNext() )
pTmpDestRow = (SwRowFrm*)pTmpDestRow-GetNext();
-OSL_ENSURE( pTmpDestRow-GetFollowRow() == pTmpSourceRow,
Knoten in der Tabelle );
+OSL_ENSURE( pTmpDestRow-GetFollowRow() == pTmpSourceRow,
Table contains node );
lcl_MoveRowContent( *pTmpSourceRow, *pTmpDestRow );
pTmpDestRow-SetFollowRow( pTmpSourceRow-GetFollowRow() );
@@ -996,9 +996,9 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool
bTryToSplit, bool bTableRowKee
lcl_InnerCalcLayout( this-Lower(), LONG_MAX, true );
}
-//Um die Positionen der Zellen mit der CutPos zu vergleichen muessen sie
-//ausgehend von der Tabelle nacheinander berechnet werden. Sie koennen
-//wg. Positionsaenderungen der Tabelle durchaus ungueltig sein.
+//In order to be able to compare the positions of the cells whit CutPos,
+//they have to be calculated consecutively starting from the table.
+//They can definitely be invalid because of position changes of the table.
SwRowFrm *pRow = static_castSwRowFrm*(Lower());
if( !pRow )
return bRet;
@@ -1268,9 +1268,9 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool
bTryToSplit, bool bTableRowKee
SwTwips nRet = 0;
-//Optimierung beim neuen Follow braucht's kein Paste und dann kann
-//das Optimierte Insert verwendet werden (nur dann treten gluecklicher
weise
-//auch groessere Mengen von Rows auf).
+//Optimization
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/manager/dp_manager.cxx | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 61eeb689d7605a23c3e71c652b57ee65cf5b28dc
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 12 13:19:32 2012 +
fix smoketest - need to check read-only-ness of non-existent paths
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 126aa04..80a9522 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -316,12 +316,19 @@ void PackageManagerImpl::initRegistryBackends()
// as to whether a directory is truly read-only or not
static bool isMacroURLReadOnly( const OUString rMacro )
{
-rtl::OUString aURL( rMacro );
-::rtl::Bootstrap::expandMacros( aURL );
+rtl::OUString aDirURL( rMacro );
+::rtl::Bootstrap::expandMacros( aDirURL );
+
+::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL );
+if ( aErr == ::osl::FileBase::E_None )
+return false; // it will be writeable
+if ( aErr != ::osl::FileBase::E_EXIST )
+return true; // some serious problem creating it
bool bError;
sal_uInt64 nWritten = 0;
-::osl::File aFile( aURL );
+rtl::OUString aFileURL( aDirURL + /stamp.sys );
+::osl::File aFile( aFileURL );
bError = aFile.open( osl_File_OpenFlag_Read |
osl_File_OpenFlag_Write |
@@ -330,12 +337,12 @@ static bool isMacroURLReadOnly( const OUString rMacro )
bError = aFile.write( 1, 1, nWritten ) != ::osl::FileBase::E_None;
if (aFile.close() != ::osl::FileBase::E_None)
bError = true;
-if (osl::File::remove( aURL ) != ::osl::FileBase::E_None)
+if (osl::File::remove( aFileURL ) != ::osl::FileBase::E_None)
bError = true;
SAL_INFO(
desktop.deployment,
-local url ' rMacro ' - ' aURL '
+local url ' rMacro ' - ' aFileURL '
(bError ? is : is not) readonly\n);
return bError;
}
@@ -370,7 +377,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
//using virtualization it appears that he/she can. Then a shared
extension can
//be installed but is only visible for the user (because the extension
is in
//the virtual store).
-stamp = OUSTR($UNO_USER_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_USER_PACKAGES_CACHE);
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(shared) )) {
that-m_activePackages = OUSTR(
@@ -381,7 +388,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/registry);
logFile = OUSTR(
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/log.txt);
-stamp = OUSTR($UNO_SHARED_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_SHARED_PACKAGES_CACHE);
}
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(bundled) )) {
that-m_activePackages = OUSTR(
@@ -420,7 +427,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
vnd.sun.star.expand:$TMP_EXTENSIONS);
that-m_registryCache = OUSTR(
vnd.sun.star.expand:$TMP_EXTENSIONS/registry);
-stamp = OUSTR($TMP_EXTENSIONS/stamp.sys);
+stamp = OUSTR($TMP_EXTENSIONS);
}
else if (! context.matchAsciiL(
RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.tdoc:/) )) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source ucb/source
desktop/source/deployment/manager/dp_manager.cxx | 64 +++
ucb/source/ucp/file/shell.cxx|4 +
2 files changed, 36 insertions(+), 32 deletions(-)
New commits:
commit d3192948fe968fc4d6a8ec0e6fda232f265b3c4c
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 9 17:02:32 2012 +
fdo#40607 - osl_syncFile having written, and avoid doing that on start
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 4f6f6c0..0efa4c0 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -311,6 +311,36 @@ void PackageManagerImpl::initRegistryBackends()
m_xComponentContext ) );
}
+// this overcomes previous rumours that the sal API is misleading
+// as to whether a directory is truly read-only or not
+static bool isMacroURLWriteable( const OUString rMacro )
+{
+if (rMacro.getLength() (sal_Int32)sizeof (vnd.sun.star.expand:))
+return true;
+rtl::OUString aURL( rMacro.copy( sizeof (vnd.sun.star.expand:) - 1 ) );
+::rtl::Bootstrap::expandMacros( aURL );
+
+bool bError;
+sal_uInt64 nWritten = 0;
+::osl::File aFile( aURL );
+
+bError = aFile.open( osl_File_OpenFlag_Read |
+ osl_File_OpenFlag_Write |
+ osl_File_OpenFlag_Create ) != ::osl::FileBase::E_None;
+if (!bError)
+bError = aFile.write( 1, 1, nWritten ) != ::osl::FileBase::E_None;
+if (aFile.close() != ::osl::FileBase::E_None)
+bError = true;
+if (osl::File::remove( aURL ) != ::osl::FileBase::E_None)
+bError = true;
+
+OSL_TRACE (local url '%s' - '%s' %s readonly\n,
+ rtl::OUStringToOString( rMacro, RTL_TEXTENCODING_UTF8
).getStr(),
+ rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr(),
+ bError ? is : is not);
+return bError;
+}
+
//__
Referencedeployment::XPackageManager PackageManagerImpl::create(
ReferenceXComponentContext const xComponentContext,
@@ -406,39 +436,9 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
ReferenceXCommandEnvironment xCmdEnv;
try {
-//There is no stampURL for the bundled folder
+// There is no stampURL for the bundled folder
if (!stampURL.isEmpty())
-{
-#define CURRENT_STAMP 1
-try {
-//The osl file API does not allow to find out if one can write
-//into a folder. Therefore we try to write a file. Then we
delete
-//it, so that it does not hinder uninstallation of OOo
-// probe writing:
-::ucbhelper::Content ucbStamp( stampURL, xCmdEnv );
-::rtl::OString stamp(
-RTL_CONSTASCII_STRINGPARAM(CURRENT_STAMP) );
-Referenceio::XInputStream xData(
-::xmlscript::createInputStream(
-::rtl::ByteSequence(
-reinterpret_castsal_Int8 const *(stamp.getStr()),
-stamp.getLength() ) ) );
-ucbStamp.writeStream( xData, true /* replace existing */ );
-that-m_readOnly = false;
-erase_path( stampURL, xCmdEnv );
-}
-catch (const RuntimeException ) {
-try {
-erase_path( stampURL, xCmdEnv );
-} catch (...)
-{
-}
-throw;
-}
-catch (const Exception ) {
-that-m_readOnly = true;
-}
-}
+that-m_readOnly = !isMacroURLWriteable( stampURL );
if (!that-m_readOnly !logFile.isEmpty())
{
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 725820d..86236f0 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1909,6 +1909,10 @@ shell::write( sal_Int32 CommandId,
}
} while( nReadBytes == nRequestedBytes );
+aFile.sync(); // fsync / flush it to disk.
+OSL_TRACE( fsync'd file '%s'\n,
+ rtl::OUStringToOString( aUnqPath, RTL_TEXTENCODING_UTF8
).getStr() );
+
err = aFile.close();
if( err != osl::FileBase::E_None )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: afms/README wizards/README xmlhelp/README xmlreader/README xpdf/README
afms/README |2 +- wizards/README |3 +++ xmlhelp/README |2 +- xmlreader/README |7 +++ xpdf/README |3 +++ 5 files changed, 15 insertions(+), 2 deletions(-) New commits: commit eea51b762236fa4c24da82e691a67527eac6a157 Author: Michael Meeks michael.me...@suse.com Date: Fri Mar 9 17:03:17 2012 + minor documentation tweaks diff --git a/afms/README b/afms/README index c149c1a..78be83a 100644 --- a/afms/README +++ b/afms/README @@ -1 +1 @@ -External package containing font metrics +External package containing font metrics. diff --git a/wizards/README b/wizards/README index c36091f..332c535 100644 --- a/wizards/README +++ b/wizards/README @@ -1 +1,4 @@ Java wizards for db setup, importing, tutorials, etc. + +There are also partially converted python copies of each wizard, which +we are hoping to migrate to in order to remove the Java dependency here. \ No newline at end of file diff --git a/xmlhelp/README b/xmlhelp/README index b4c1f05..3e54ddc 100644 --- a/xmlhelp/README +++ b/xmlhelp/README @@ -1 +1 @@ -Help reader and viewer for online help. +Help reader and viewer for online help. \ No newline at end of file diff --git a/xmlreader/README b/xmlreader/README new file mode 100644 index 000..92a624d --- /dev/null +++ b/xmlreader/README @@ -0,0 +1,7 @@ +fast/small XML pull parser. + +Implements a simple, fast pull parser, currently used by [[configmgr]] and +[[stoc]]'s simpleregistry code (used to register UNO components in +services.rdb files). It supports a subset of XML features, but is fast +and small. + diff --git a/xpdf/README b/xpdf/README index dffe106..0c73365 100644 --- a/xpdf/README +++ b/xpdf/README @@ -1 +1,4 @@ PDF-viewer library from [http://www.foolabs.com/xpdf/]. + +This code is -used by [[sdext/source/pdfimport]] to implement the PDF +import functionality, that allows PDF's to be edited. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - qadevOOo/tests
qadevOOo/tests/java/ifc/beans/_XPropertySet.java |4
1 file changed, 4 insertions(+)
New commits:
commit b4931cf9e7d5a4bcda7c52c46d6c4f5e32420396
Author: Michael Stahl mst...@redhat.com
Date: Tue Mar 6 23:51:54 2012 +0100
qadevOOo: _XPropertySet.java: fix unrealistic expectations:
We can't assume that when setting properties whose semantics we don't
know to random values in an arbitrary order, a non-changing value
indicates any kind of error.
The only real error this test can detect is if setting a property
crashes.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 07efacb..09e933f 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -319,11 +319,15 @@ public class _XPropertySet extends MultiMethodTest {
property '+ propertyName+');
e.printStackTrace(log);
} // end of try-catch
+/* this is stupid: we can't set properties whose semantics we
+ * don't know to random values in an arbitrary order and
+ * expect that to actually work.
if( gValue.equals(sValue) )
{
log.println(setting property '+ propertyName+' failed);
error = true;
}
+*/
}
tRes.tested(setPropertyValue(),!error);
} //endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idlc/README solenv/README unodevtools/README
idlc/README|6 +- solenv/README | 48 unodevtools/README |6 ++ 3 files changed, 59 insertions(+), 1 deletion(-) New commits: commit 534b3a9b2e828401ff69500a54f894e1cad4a78d Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 6 11:07:48 2012 + idle code documentation improvement diff --git a/idlc/README b/idlc/README index 877702a..1b4c1f7 100644 --- a/idlc/README +++ b/idlc/README @@ -1,2 +1,6 @@ -Contains the IDL compiler. +Contains the C++ IDL compiler: idlcpp +This compiler generates C++ headers - .hpp and .hdl files that provide +the UNO C++ binding. That compilation is done primarily in the offapi +and udkapi directories. +2 diff --git a/solenv/README b/solenv/README new file mode 100644 index 000..904c610 --- /dev/null +++ b/solenv/README @@ -0,0 +1,48 @@ +Tools and makefile fragments necessary for compilation + +This module contains many tools and makefile configuration pieces, +critical for building LibreOffice: + +bin/ + contains lots of tools used during the build: + + build.pl + the top-level wrapper perl-script, from the dmake + days - we're incrementally removing this in favour + of gnumake + + deliver.pl + copies files from old-style dmake packages into the + top-level 'solver' directory + + concat-deps* + these aggregate, and remove duplicates from module + dependencies, to accelerate build times. + + make_installer.pl + this script executes the compiled instructions from + the scp2/ module to create an installer, and/or to + do a local install for the smoketest. + + linkoo + creates a forest of symlinks inside an install such + that a developer can re-compile in the source tree, + and re-run without re-installing (on Unix at least) + +gbuild/ + the (shiny new) gnumake build makefile fragments we are + migrating the codebase to use. + +gdb/ + lots of nice python helpers to make debugging -much- easier + that (eg.) print UCS2 strings as UTF-8 on the console to + help with debugging. + +inc/ + old / increasingly obsolete dmake setup and includes, we are + trying to entirely rid ourselves of this + +src/ + useful standard / re-usable component map files for components + which shouldn't export anything more than a few registration + symbols. \ No newline at end of file diff --git a/unodevtools/README b/unodevtools/README new file mode 100644 index 000..f53328e --- /dev/null +++ b/unodevtools/README @@ -0,0 +1,6 @@ +Helper tools for external UNO component developers + +This module contains some tools for people writing UNO components. In +particular it will auto-generate skeletons for implementing UNO +interfaces - that declare all the relevant methods leaving the code to +be filled in. This can be done for C++ or Java. \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/README
binfilter/README | 10 ++ 1 file changed, 10 insertions(+) New commits: commit bb886bf268e6dfd3bf4b09975da274aa031faa3a Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 6 14:32:05 2012 + add initial explanatory documentation diff --git a/binfilter/README b/binfilter/README new file mode 100644 index 000..1c2da8d --- /dev/null +++ b/binfilter/README @@ -0,0 +1,10 @@ +Obsolete legacy binary filters + +This module contains (substantially) a cut/paste job of the entire +code-base from an ancient time. This was done to facilitate internal +re-factoring, by allowing the old code structure (as codified in the +legacy binary file formats) to remain the same. + +The basic idea is that this code runs and spits out big chunks of XML +which are then imported by the more modern code-base, thus providing +legacy filter support to LibreOffice. \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: afms/README android/README avmedia/README basic/README berkeleydb/README cairo/README chart2/README clucene/README configmgr/README dmake/README
afms/README |2 +- android/README|1 + avmedia/README|5 +++-- basic/README |6 +- berkeleydb/README |4 cairo/README |5 + chart2/README |3 +++ clucene/README|4 configmgr/README |5 + dmake/README |8 10 files changed, 39 insertions(+), 4 deletions(-) New commits: commit dc24525d098d3dbf303dcfa04cae319592107907 Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 6 14:41:45 2012 + more idle code documentation improvement diff --git a/afms/README b/afms/README index 5bf..c149c1a 100644 --- a/afms/README +++ b/afms/README @@ -1 +1 @@ -External library. +External package containing font metrics diff --git a/android/README b/android/README new file mode 100644 index 000..bcd080b --- /dev/null +++ b/android/README @@ -0,0 +1 @@ +android specific code, wrapper logic and tests diff --git a/avmedia/README b/avmedia/README index b33f70c..eaa257d 100644 --- a/avmedia/README +++ b/avmedia/README @@ -1,4 +1,5 @@ Audio/Video media implementation. -Needs a Java Media Framework (JMF). -Not currently usable for streams but only for URIs in the file system. +Provides per-platform implementations of multimedia functionality. +Currently no stream API is provided, only a URI based one, so +streaming has to be wrapped around it via temp files. diff --git a/basic/README b/basic/README index bed2870..e4176cd 100644 --- a/basic/README +++ b/basic/README @@ -1,4 +1,8 @@ -Contains the StarBASIC Interpreter and in addition the GUI of VCLTestTool. +Contains the StarBASIC Interpreter + +This implements a macro language that, when in VBA compatibility mode, +is intended to be interoperable with Visual Basic for Applications, +allowing people to run macros embedded in their documents. See also: [http://wiki.services.openoffice.org/wiki/Basic] diff --git a/berkeleydb/README b/berkeleydb/README index f065127..470f2ab 100644 --- a/berkeleydb/README +++ b/berkeleydb/README @@ -1 +1,5 @@ The Berkeley database. + +This code is used primarily for legacy UNO component registration in +the users' directory, for some small bits in xmlhelp, and for the help +compiler. \ No newline at end of file diff --git a/cairo/README b/cairo/README index aec01a8..3d955dc 100644 --- a/cairo/README +++ b/cairo/README @@ -1 +1,6 @@ The graphics library, used for anti-aliasing. From [http://cairographics.org/]. + +This code is used by default only on Linux, though it is also +available on Mac. There is a cairo-canvas implementation that is the +main customer, and it is enabled via 'use hardware acceleration' in +the general options. diff --git a/chart2/README b/chart2/README index 6e87ad9..c6a5495 100644 --- a/chart2/README +++ b/chart2/README @@ -1 +1,4 @@ Chart implementation for LibreOffice Calc. + +The chart2 denotes a second generation re-write done to rid us of the +foul and twisted legacy chart code. \ No newline at end of file diff --git a/clucene/README b/clucene/README new file mode 100644 index 000..458762a --- /dev/null +++ b/clucene/README @@ -0,0 +1,4 @@ +External package containing clucene. + +This is used to index our downloadable help packages, and allow them +to be searched efficiently at run-time. \ No newline at end of file diff --git a/configmgr/README b/configmgr/README index 2c3cfa6..15cc2cf 100644 --- a/configmgr/README +++ b/configmgr/README @@ -1,5 +1,10 @@ UNO services to access the configuration database +== Functional Overview == + +This code parses the settings that are described in the [[officecfg]] +directory, and provides an UNO API that code can use to set and get +settings. == Source Overview == diff --git a/dmake/README b/dmake/README new file mode 100644 index 000..09ad5fe --- /dev/null +++ b/dmake/README @@ -0,0 +1,8 @@ +Obsolete dmake build tool. + +The dmake build tool was for years the backbone of building the +codebase. Herein lies the bones of that effort - a patched, and fixed +up version of dmake that mostly works even on Windows. + +It is now being incrementally written-out in favour of the faster +gnumake approach. \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: codemaker/inc codemaker/source sc/inc sc/source svx/inc svx/source unusedcode.easy
codemaker/inc/codemaker/global.hxx|1 -
codemaker/source/codemaker/global.cxx | 23 ---
sc/inc/callform.hxx |2 --
sc/source/core/tool/callform.cxx | 11 ---
svx/inc/svx/graphctl.hxx |1 -
svx/source/dialog/graphctl.cxx| 21 -
unusedcode.easy |3 ---
7 files changed, 62 deletions(-)
New commits:
commit 51791eaf8611287c21ad53645036a77c1dd84ddf
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 6 15:01:13 2012 +
remove misc. unused code
diff --git a/codemaker/inc/codemaker/global.hxx
b/codemaker/inc/codemaker/global.hxx
index 2406305..3134daa 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -87,7 +87,6 @@ class FileStream
{
public:
FileStream();
-FileStream(const ::rtl::OString name, FileAccessMode nMode =
FAM_READWRITE);
virtual ~FileStream();
sal_Bool isValid();
diff --git a/codemaker/source/codemaker/global.cxx
b/codemaker/source/codemaker/global.cxx
index af87ee8..ebcd3c0 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -295,29 +295,6 @@ FileStream::FileStream()
{
}
-FileStream::FileStream(const OString name, FileAccessMode mode)
-: m_file(NULL)
-{
-if ( !name.isEmpty() )
-{
-OUString sUrl(convertToFileUrl(name));
-#ifdef SAL_UNX
-sal_uInt64 uAttr = osl_File_Attribute_OwnWrite |
- osl_File_Attribute_OwnRead |
- osl_File_Attribute_GrpWrite |
- osl_File_Attribute_GrpRead |
- osl_File_Attribute_OthRead;
-if (osl_openFile(sUrl.pData, m_file, checkAccessMode(mode)) ==
osl_File_E_None
-osl_setFileAttributes(sUrl.pData, uAttr) == osl_File_E_None)
-#else
-if (osl_openFile(sUrl.pData, m_file, checkAccessMode(mode)) ==
osl_File_E_None)
-#endif
-m_name = name;
-else
-m_file = NULL;
-}
-}
-
FileStream::~FileStream()
{
if ( isValid() )
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index 46348bd..023ee45 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -69,8 +69,6 @@ class FuncData
sal_uInt16 nParamCount;
ParamType eAsyncType;
ParamType eParamType[MAXFUNCPARAM];
-private:
-FuncData(const rtl::OUString rIName);
public:
FuncData(const ModuleData*pModule,
const rtl::OUString rIName,
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 4fa3d1d..3f8ad8b 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -101,17 +101,6 @@ public:
voidFreeInstance() { delete pInstance; pInstance = 0; }
};
-FuncData::FuncData(const rtl::OUString rIName) :
-pModuleData (NULL),
-aInternalName (rIName),
-nNumber (0),
-nParamCount (0),
-eAsyncType (NONE)
-{
-for (sal_uInt16 i = 0; i MAXFUNCPARAM; i++)
-eParamType[i] = PTR_DOUBLE;
-}
-
//
FuncData::FuncData(const ModuleData*pModule,
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index b235210..21c376c 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -91,7 +91,6 @@ protected:
public:
-GraphCtrl( Window* pParent, const WinBits nWinBits = 0
);
GraphCtrl( Window* pParent, const ResId rResId );
~GraphCtrl();
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index d8f3f9f..019cf61 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -63,27 +63,6 @@ void GraphCtrlUserCall::Changed( const SdrObject rObj,
SdrUserCallType eType, c
}
}
-GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
-Control ( pParent, nWinBits ),
-aMap100 ( MAP_100TH_MM ),
-eObjKind( OBJ_NONE ),
-nPolyEdit ( 0 ),
-bEditMode ( sal_False ),
-bSdrMode( sal_False ),
-mpAccContext( NULL ),
-pModel ( NULL ),
-pView ( NULL )
-{
-pUserCall = new GraphCtrlUserCall( *this );
-aUpdateTimer.SetTimeout( 200 );
-aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) );
-aUpdateTimer.Start();
-
-SetWinStyle( nWinBits );
-
-EnableRTL( sal_False );
-}
-
GraphCtrl::GraphCtrl( Window* pParent, const ResId rResId ) :
Control ( pParent, rResId ),
aMap100 ( MAP_100TH_MM ),
diff --git a/unusedcode.easy b/unusedcode.easy
index 7b0a3b7..e9157ed 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,7 +5,6 @@ CharPosArray::Replace(int const
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/bibliography/bibload.cxx | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 33ef1ffbd15994ec71be99d38c0d5171c63344a2
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Mar 6 18:16:35 2012 +0100
lp#527938, debian#602953, fdo#33266, i#105408: do not crash on clicking
bibliography when base isnt installed
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index c80c81e..9159124 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -54,6 +54,7 @@
#include com/sun/star/text/BibliographyDataField.hpp
#include com/sun/star/form/XLoadListener.hpp
#include com/sun/star/frame/XLayoutManager.hpp
+#include com/sun/star/uno/XAggregation.hpp
#include toolkit/awt/vclxwindow.hxx
#include vcl/window.hxx
#include vcl/edit.hxx
@@ -243,13 +244,27 @@ void BibliographyLoader::cancel(void) throw
(::com::sun::star::uno::RuntimeExcep
}
// ---
+namespace
+{
+// lp#527938, debian#602953, fdo#33266, i#105408
+static bool lcl_isBaseAvailable()
+{
+Reference XMultiServiceFactory xMgr =
comphelper::getProcessServiceFactory();
+Reference XAggregation xAggregate = Reference XAggregation (
xMgr-createInstance(C2U(com.sun.star.sbd.RowSet)), UNO_QUERY);
+return xAggregate.is();
+}
+}
void BibliographyLoader::load(const Reference XFrame rFrame, const
rtl::OUString rURL,
const Sequence PropertyValue rArgs,
const Reference XLoadEventListener rListener) throw
(::com::sun::star::uno::RuntimeException)
{
-//!
+// lp#527938, debian#602953, fdo#33266, i#105408
+// make sure we actually can instanciate services from base first
+if(!lcl_isBaseAvailable())
+return;
SolarMutexGuard aGuard;
+
m_pBibMod = OpenBibModul();
String aURLStr( rURL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/unoobj/chart2uno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6444d7ed7a4f99ffcd8d04c5d27722d8c4d942b2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 4 00:05:33 2012 +0100
don't crash for empty input data in charts, fdo#46885
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53b049b..93dcb56 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1565,7 +1565,7 @@ ScChart2DataProvider::createDataSource(
}
Reference chart2::data::XLabeledDataSequence xChartSeries =
lcl_createLabeledDataSequenceFromTokens(
pValueTokens, pLabelTokens, m_pDocument, this,
m_bIncludeHiddenCells ); //ownership of pointers is transfered!
-if ( xChartSeries.is()
xChartSeries-getValues()-getData().getLength() )
+if ( xChartSeries.is() xChartSeries-getValues().is()
xChartSeries-getValues()-getData().getLength() )
{
aSeqs.push_back( xChartSeries );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source
scp2/source/ooo/common_brand.scp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f0865c76cb372a704728704923058c61dba32a4f Author: Thorsten Behrens tbehr...@suse.com Date: Mon Mar 5 12:00:48 2012 + Package the credits etc. in the right place on Mac Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 19f560f..a76b8b8 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1526,7 +1526,7 @@ End File gid_License_Odt BIN_FILE_BODY; #if defined MACOSX -Dir = gid_Brand_Dir_BasisLink; +Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; #endif @@ -1537,7 +1537,7 @@ End File gid_Credits_Odt BIN_FILE_BODY; #if defined MACOSX -Dir = gid_Brand_Dir_BasisLink; +Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - connectivity/source
connectivity/source/drivers/postgresql/pq_tools.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 5cd4dc32f2518897ab48ed2afb09e363a39b7647 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Mar 3 23:41:06 2012 +0100 Fix lacking break in switch Signed-off-by: Julien Nabet serval2...@yahoo.fr Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index c27bf15..7fa889f 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -532,6 +532,7 @@ static bool isOperator( char c ) case '?': case '$': ret = true; +break; default: ret = false; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/source
sfx2/source/dialog/dinfdlg.cxx | 245 +++--
1 file changed, 116 insertions(+), 129 deletions(-)
New commits:
commit 8a997fd7e0e034e27219ce67d73f8195e95a4716
Author: William Gathoye will...@gathoye.be
Date: Mon Mar 5 20:50:56 2012 +
Fix indentation
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 874e455..2b4e06d 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -26,7 +26,6 @@
*
/
-
#include tools/urlobj.hxx
#include vcl/msgbox.hxx
#include svl/eitem.hxx
@@ -85,7 +84,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-
struct CustomProperty
{
::rtl::OUString m_sName;
@@ -99,7 +97,6 @@ struct CustomProperty
{ return m_sName.equals( rProp.m_sName ) m_aValue == rProp.m_aValue; }
};
-
static
bool operator==(const util::DateTime i_rLeft, const util::DateTime i_rRight)
{
@@ -113,7 +110,6 @@ bool operator==(const util::DateTime i_rLeft, const
util::DateTime i_rRight)
}
// STATIC DATA ---
-
TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
const sal_uInt16 HI_NAME = 1;
@@ -121,7 +117,7 @@ const sal_uInt16 HI_TYPE = 2;
const sal_uInt16 HI_VALUE = 3;
const sal_uInt16 HI_ACTION = 4;
-static const char DOCUMENT_SIGNATURE_MENU_CMD[] = Signature;
+static const char DOCUMENT_SIGNATURE_MENU_CMD[] = Signature;
//
String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True,
sal_Bool bSmartExtraBytes = sal_False );
@@ -326,28 +322,23 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const
SfxDocumentInfoItem rItem )
}
//
-
SfxDocumentInfoItem::~SfxDocumentInfoItem()
{
ClearCustomProperties();
}
//
-
SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
{
return new SfxDocumentInfoItem( *this );
}
//
-
int SfxDocumentInfoItem::operator==( const SfxPoolItem rItem) const
{
-if (!(rItem.Type() == Type() SfxStringItem::operator==(rItem))) {
+if (!(rItem.Type() == Type() SfxStringItem::operator==(rItem)))
return false;
-}
-const SfxDocumentInfoItem rInfoItem(
-static_castconst SfxDocumentInfoItem(rItem));
+const SfxDocumentInfoItem rInfoItem(static_castconst
SfxDocumentInfoItem(rItem));
return
m_AutoloadDelay== rInfoItem.m_AutoloadDelay
@@ -372,7 +363,6 @@ int SfxDocumentInfoItem::operator==( const SfxPoolItem
rItem) const
}
//
-
void SfxDocumentInfoItem::resetUserData(const ::rtl::OUString i_rAuthor)
{
setAuthor(i_rAuthor);
@@ -389,7 +379,6 @@ void SfxDocumentInfoItem::resetUserData(const
::rtl::OUString i_rAuthor)
}
//
-
void SfxDocumentInfoItem::UpdateDocumentInfo(
const uno::Referencedocument::XDocumentProperties i_xDocProps,
bool i_bDoNotUpdateUserDefined) const
@@ -462,7 +451,6 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
//
-
sal_Bool SfxDocumentInfoItem::IsDeleteUserData() const
{
return m_bDeleteUserData;
@@ -639,7 +627,6 @@ bool SfxDocumentInfoItem::PutValue( const Any rVal,
sal_uInt8 nMemberId )
}
//
-
SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet
rItemSet ) :
SfxTabPage( pParent, SfxResId( TP_DOCINFODESC ), rItemSet ),
@@ -660,14 +647,12 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window *
pParent, const SfxItemSet rI
}
//
-
SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet
rItemSet)
{
return new SfxDocumentDescPage(pParent, rItemSet);
}
//
-
sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
{
// Test whether a change is present
@@ -675,7 +660,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
const sal_Bool bThemeMod = aThemaEd.IsModified();
const sal_Bool bKeywordsMod = aKeywordsEd.IsModified();
const sal_Bool bCommentMod = aCommentEd.IsModified();
-if( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
+if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
{
return
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0be7432f3b5210808438ab2ab2bae09a81b06ae8 Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 5 20:56:51 2012 + fix icecream check to not break on SUSE diff --git a/configure.in b/configure.in index f0ac6a0..49ce97f 100644 --- a/configure.in +++ b/configure.in @@ -2179,7 +2179,7 @@ GCC_HOME_SET=true AC_MSG_CHECKING([gcc home]) if test -z $with_gcc_home; then if test $enable_icecream = yes ; then -if test -d /usr/lib/icecc/ ; then +if test -d /usr/lib/icecc/bin ; then GCC_HOME=/usr/lib/icecc/ else GCC_HOME=/opt/icecream/ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/source framework/inc framework/source
basic/source/runtime/methods.cxx |3 +++
basic/source/runtime/methods1.cxx |3 ++-
framework/inc/dispatch/closedispatcher.hxx|1 +
framework/source/dispatch/closedispatcher.cxx | 11 +--
4 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit fe4bb3579ad4539034deada1e201aa8d9ed6518f
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 5 22:31:43 2012 +
basic: add missing forward declarations for helper functions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 28ce80f..fa7d7a1 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -122,6 +122,9 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#ifndef DISABLE_SCRIPTING
+// forward decl.
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
double rdRet );
+
// from source/classes/sbxmod.cxx
Reference XModel getDocumentModel( StarBASIC* );
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 91c739f..51f73d1 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -70,6 +70,7 @@ using namespace com::sun::star::i18n;
void unoToSbxValue( SbxVariable* pVar, const Any aValue );
Any sbxToUnoValue( SbxVariable* pVar, const Type rType,
com::sun::star::beans::Property* pUnoProperty = NULL );
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16
nFirstDay = 0 );
static Reference XCalendar3 getLocaleCalendar( void )
{
@@ -3210,7 +3211,7 @@ RTLFUNC(Me)
#endif
-sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16
nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16
nFirstDay )
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
commit 5b2cb23c429e1be1099008473770c634ce96c969
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 5 21:18:00 2012 +
attempt fix of hang on base close, due to solarmutex deadlock on join
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index 81d8842..eabad8c 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -206,6 +206,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
during they call us ...
*/
DECL_LINK( impl_asyncCallback, void* );
+void doClose();
//---
/** @short prepare m_xCloseFrame so it should be closeable without
problems.
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index 01523d2..0b670eb 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -268,6 +268,13 @@ void SAL_CALL
CloseDispatcher::dispatchWithNotification(const css::util::URL
*/
IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{
+SolarMutexReleaser aReleaser;
+doClose();
+return 0;
+}
+
+void CloseDispatcher::doClose()
+{
try
{
@@ -296,7 +303,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
// frame already dead ?!
// Nothing to do !
if (! xCloseFrame.is())
-return 0;
+return;
sal_Bool bCloseFrame = sal_False;
sal_Bool bEstablishBackingMode = sal_False;
@@ -452,7 +459,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{
}
-return 0;
+return;
}
//---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 13 +
1 file changed, 13 insertions(+)
New commits:
commit b233485a3ef2e0acb65032945e46eb3d20dbc3d9
Author: Andras Timar ati...@suse.com
Date: Fri Mar 2 10:46:17 2012 +0100
fdo#46181 Use Traditional Chinese installer for zh-HK and zh-MO locales
Microsoft Installer thinks that it is a good idea to fall back to zh-CN
from zh-HK and zh-MO. It is wrong, because zh-CN uses Simplified Chinese
zh-HK and zh-MO use Traditional Chinese. So we need to fall back to zh-TW.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
Signed-off-by: Tor Lillqvist t...@iki.fi
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 96c9606..03b31a3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -,6 +,19 @@ sub create_transforms
chdir($installdir);
$systemcall = $msidb . . -d . $basedbname . -r .
$windowslanguage;
system($systemcall);
+ # fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW
not to zh-CN
+ # we need to hack zh-HK and zh-MO LCIDs directly into the MSI
+ if($windowslanguage eq '1028')
+{
+rename 1028,3076;
+ $systemcall = $msidb . . -d . $basedbname . -r
. 3076;
+system($systemcall);
+rename 3076,5124;
+ $systemcall = $msidb . . -d . $basedbname . -r
. 5124;
+system($systemcall);
+$templatevalue = $templatevalue . , . 3076 . , . 5124;
+rename 5124,1028;
+ }
chdir($from);
unlink($transformfile);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source
sc/source/core/data/cell.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 17322a611dd5add334f15539193dd0090e99ef01
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 12:59:14 2012 +0100
use the correct db range for the copy, fdo#46712
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 8ddc540..9b431fa 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -226,7 +226,7 @@ void adjustDBRange(ScToken* pToken, ScDocument rNewDoc,
const ScDocument* pOldD
ScDBData* pNewDBData = aNewNamedDBs.findByName(aDBName);
if (!pNewDBData)
{
-pNewDBData = new ScDBData(*pNewDBData);
+pNewDBData = new ScDBData(*pDBData);
aNewNamedDBs.insert(pNewDBData);
}
pToken-SetIndex(pNewDBData-GetIndex());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source
sc/source/core/data/documen2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d69bb1d4535871b981df27f11bd4918ad3a41fe4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 1 11:50:13 2012 +0100
use correct source table
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index b0ae78e..c6bf77b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -955,7 +955,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
// Copy the RTL settings
maTabs[nDestPos]-SetLayoutRTL(pSrcDoc-maTabs[nSrcPos]-IsLayoutRTL());
-
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nDestPos]-IsLoadingRTL());
+
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nSrcPos]-IsLoadingRTL());
}
else// bestehende Tabelle ersetzen
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: autogen.sh
autogen.sh |4
1 file changed, 4 insertions(+)
New commits:
commit 39d026a11fc67bc45fc974fe8eab04ef9499fa31
Author: Thomas Collerton tom.col...@gmail.com
Date: Wed Feb 29 11:50:02 2012 +0100
fdo#46565: perl / autogen.sh should backup autogen.lastrun
diff --git a/autogen.sh b/autogen.sh
index d41ccdd..2133d07 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -144,6 +144,10 @@ if (defined $ENV{NOCONFIGURE}) {
# Save autogen.lastrun only if we did get some arguments on the
command-line
if (@ARGV) {
if (scalar(@cmdline_args) 0) {
+# if there's already an autogen.lastrun, make a backup first
+if (-e autogen.lastrun) {
+system(cp autogen.lastrun autogen.lastrun.bak);
+}
# print writing args to autogen.lastrun\n;
my $fh;
open ($fh, autogen.lastrun) || die can't open autogen.lastrun:
$!;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sot/qa sot/source
sot/qa/cppunit/data/pass/fdo41642-3.compound |binary
sot/source/sdstor/stgdir.cxx | 11 +++
2 files changed, 11 insertions(+)
New commits:
commit c2ad33a233d7458909fc18a23c02bd2c6e298940
Author: Wei Ming Khoo wm...@cam.ac.uk
Date: Wed Feb 29 13:01:35 2012 +
fix storage chain loop
Signed-off-by: Caolan McNamara caol...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sot/qa/cppunit/data/pass/fdo41642-3.compound
b/sot/qa/cppunit/data/pass/fdo41642-3.compound
new file mode 100644
index 000..46a9e84
Binary files /dev/null and b/sot/qa/cppunit/data/pass/fdo41642-3.compound differ
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 4f9ef46..ccc7b17 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -826,6 +826,17 @@ void StgDirStrm::SetupEntry( sal_Int32 n, StgDirEntry*
pUpper )
return;
}
+if (pUpper)
+{
+StgDirEntry *pUpperUpper = pUpper-pUp;
+if (pUpperUpper pUpperUpper-aEntry.GetLeaf(STG_CHILD) ==
nLeaf)
+{
+OSL_FAIL(Leaf node of upper-upper StgDirEntry is same as
current StgDirEntry's leaf node. Circular entry chain, discarding link);
+delete pCur;
+return;
+}
+ }
+
if( StgAvlNode::Insert
( (StgAvlNode**) ( pUpper ? pUpper-pDown : pRoot ), pCur ) )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/source
svx/source/svdraw/svdograf.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 63a480aac59d459e9f759c5a346bebdda0c78acd
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 29 22:34:51 2012 +0100
fdo#46340: fix crash in SdrGrafObj::getInputStream:
Add the ridiculous hack that used to be here (and distributed across
various GetDocumentStream methods to make it non-obvious)
that makes this not crash by accident.
(regression from fd95f1ab6220c6a530fd2e4e727417f504a5db51)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index c82b5fe..e6ed8a6 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1310,6 +1310,14 @@ Reference XInputStream SdrGrafObj::getInputStream()
::comphelper::LifecycleProxy proxy;
xStream.set(
pModel-GetDocumentStream(pGraphic-GetUserData(), proxy));
+// fdo#46340: this may look completely insane, and it is,
+// but it also prevents a crash: the LifecycleProxy will go out
+// of scope, but the xStream must be returned; the UcbStreamHelper
+// will actually copy the xStream to a temp file (because it is
+// not seekable), which makes it not crash...
+SvStream *const pStream =
+utl::UcbStreamHelper::CreateStream(xStream);
+xStream.set(new utl::OInputStreamWrapper(pStream, true));
}
else if( pGraphic GetGraphic().IsLink() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - extensions/source
extensions/source/nsplugin/source/so_instance.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0334a6ec8311503d9162d41973825ad8616db652
Author: Rene Engelhard r...@debian.org
Date: Wed Feb 29 23:19:00 2012 +0100
fix nsplugin to create correct com.sun.star.ucb.SimpleFileAccess instance
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Tor Lillqvist t...@iki.fi
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/nsplugin/source/so_instance.cxx
b/extensions/source/nsplugin/source/so_instance.cxx
index 776319b..964ef14 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -241,7 +241,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
//create stream for the document
Reference ::com::sun::star::ucb::XSimpleFileAccess
xSimpleFileAccess(
-mxRemoteMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccessw))
),
+mxRemoteMSF-createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.SimpleFileAccess))
),
uno::UNO_QUERY );
if(!xSimpleFileAccess.is())
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sw/inc sw/source
sw/inc/doc.hxx |2 -
sw/source/core/doc/docfmt.cxx| 48 ---
sw/source/ui/dochdl/swdtflvr.cxx |2 -
3 files changed, 32 insertions(+), 20 deletions(-)
New commits:
commit 0f2954dd3a1dcd9a4d2cc6a39e6b489acb223f10
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 27 12:39:06 2012 +
Resolves: fdo#46038 don't copy page styles into temporary clipboard doc
writer rtf export has a nasty pgdsctbl extension
sd rtf import has nasty if its got a table keyword in it its a table
logic
Classically we never put our styles into the temporary clipboard, so fastest
and safest fix is to simply skip putting the page styles into it.
(cherry picked from commit 15547450bdba10959473c2cb5891f29ad5053b09)
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Tor Lillqvist t...@iki.fi
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8165a57..29be2a7 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1275,7 +1275,7 @@ public:
SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl rColl );
// Replace all styles with those from rSource.
-void ReplaceStyles( const SwDoc rSource );
+void ReplaceStyles( const SwDoc rSource, bool bIncludePageStyles = true );
// Replace all property defaults with those from rSource.
void ReplaceDefaults( const SwDoc rSource );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 10cd5f7..54a9707 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2135,7 +2135,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc rSrcDesc,
SwPageDesc rDstDesc,
}
}
-void SwDoc::ReplaceStyles( const SwDoc rSource )
+void SwDoc::ReplaceStyles( const SwDoc rSource, bool bIncludePageStyles )
{
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -2146,26 +2146,38 @@ void SwDoc::ReplaceStyles( const SwDoc rSource )
CopyFmtArr( *rSource.pTxtFmtCollTbl, *pTxtFmtCollTbl,
SwDoc::_MakeTxtFmtColl, *pDfltTxtFmtColl );
-// and now the page templates
-sal_uInt16 nCnt = rSource.aPageDescs.Count();
-if( nCnt )
-{
-// a different Doc - Number formatter needs to be merged
-SwTblNumFmtMerge aTNFM( rSource, *this );
+sal_uInt16 nCnt;
-// 1st step: Create all formats (skip the 0th - it's the default!)
-while( nCnt )
+//To-Do:
+// a) in rtf export don't export our hideous pgdsctbl
+// extension to rtf anymore
+// b) in sd rtf import (View::InsertData) don't use
+// a super-fragile test for mere presence of \trowd to
+// indicate import of rtf into a table
+// c) then drop use of bIncludePageStyles
+if (bIncludePageStyles)
+{
+// and now the page templates
+nCnt = rSource.aPageDescs.Count();
+if( nCnt )
{
-SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
-if( 0 == ::lcl_FindPageDesc( aPageDescs, pSrc-GetName() ) )
-MakePageDesc( pSrc-GetName() );
-}
+// a different Doc - Number formatter needs to be merged
+SwTblNumFmtMerge aTNFM( rSource, *this );
-// 2nd step: Copy all attributes, set the right parents
-for( nCnt = rSource.aPageDescs.Count(); nCnt; )
-{
-SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
-CopyPageDesc( *pSrc, *::lcl_FindPageDesc( aPageDescs,
pSrc-GetName() ));
+// 1st step: Create all formats (skip the 0th - it's the default!)
+while( nCnt )
+{
+SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
+if( 0 == ::lcl_FindPageDesc( aPageDescs, pSrc-GetName() ) )
+MakePageDesc( pSrc-GetName() );
+}
+
+// 2nd step: Copy all attributes, set the right parents
+for( nCnt = rSource.aPageDescs.Count(); nCnt; )
+{
+SwPageDesc *pSrc = rSource.aPageDescs[ --nCnt ];
+CopyPageDesc( *pSrc, *::lcl_FindPageDesc( aPageDescs,
pSrc-GetName() ));
+}
}
}
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index e5fdd55..dfa85ed 100755
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -379,7 +379,7 @@ namespace
//It would probably make most sense here to only insert the styles used
//by the selection, e.g. apply SwDoc::IsUsed on styles ?
-rDest.ReplaceStyles(rSrc);
+rDest.ReplaceStyles(rSrc, false);
rSrcWrtShell.Copy(rDest);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - filter/source
filter/source/pdf/impdialog.src |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 5d844b8dd9b86668d4e16f60537e6e14d2a19433
Author: Andras Timar ati...@suse.com
Date: Tue Feb 28 14:06:16 2012 +0100
fdo#45023 UI fix on PDF export dialog
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 006fa3a..dd8d50b 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -177,8 +177,9 @@ TabPage RID_PDF_TAB_GENER
};
FixedText FT_ADDSTREAMDESCRIPTION
{
-Pos = MAP_APPFONT( 206 , 27 ) ;
-Size = MAP_APPFONT( 140, 8 ) ;
+Pos = MAP_APPFONT( 206 , 23 ) ;
+Size = MAP_APPFONT( 140, 16 ) ;
+Wordbreak = TRUE ;
Text[ en-US ] = Makes this PDF easily editable in %PRODUCTNAME ;
};
CheckBox CB_PDFA_1B_SELECT
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic
vcl/generic/print/glyphset.cxx | 76 +++--
vcl/generic/print/glyphset.hxx |3 +
2 files changed, 15 insertions(+), 64 deletions(-)
New commits:
commit 15cf249967a56e1d6b28b659c00e201161f2e98f
Author: Christina Rossmanith chrrossman...@web.de
Date: Tue Feb 28 11:04:12 2012 +0100
Reduced duplicate code (simian) / vcl/generic/print/glyphset.cxx
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 5b03666..6d4cfde 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -479,7 +479,8 @@ void GlyphSet::DrawGlyphs(
const sal_uInt32* pGlyphIds,
const sal_Unicode* pUnicodes,
sal_Int16 nLen,
- const sal_Int32* pDeltaArray )
+ const sal_Int32* pDeltaArray,
+ const sal_Bool bUseGlyphs)
{
sal_uChar *pGlyphID= (sal_uChar*)alloca (nLen * sizeof(sal_uChar));
sal_Int32 *pGlyphSetID = (sal_Int32*)alloca (nLen * sizeof(sal_Int32));
@@ -488,7 +489,10 @@ void GlyphSet::DrawGlyphs(
// convert unicode to font glyph id and font subset
for (int nChar = 0; nChar nLen; nChar++)
{
-GetGlyphID (pGlyphIds[nChar], pUnicodes[nChar], pGlyphID + nChar,
pGlyphSetID + nChar);
+if (bUseGlyphs)
+GetGlyphID (pGlyphIds[nChar], pUnicodes[nChar], pGlyphID + nChar,
pGlyphSetID + nChar);
+else
+GetCharID (pUnicodes[nChar], pGlyphID + nChar, pGlyphSetID +
nChar);
aGlyphSet.insert (pGlyphSetID[nChar]);
}
@@ -536,7 +540,12 @@ void GlyphSet::DrawGlyphs(
// show the text using the PrinterGfx text api
aPoint.Move (nOffset, 0);
-OString aGlyphSetName(GetGlyphSetName(*aSet));
+OString aGlyphSetName;
+if (bUseGlyphs)
+aGlyphSetName = GetGlyphSetName(*aSet);
+else
+aGlyphSetName = GetCharSetName(*aSet);
+
rGfx.PSSetFont (aGlyphSetName, GetGlyphSetEncoding(*aSet));
rGfx.PSMoveTo (aPoint);
rGfx.PSShowText (pGlyphSubset, nGlyphs, nGlyphs, nGlyphs 1 ?
pDeltaSubset : NULL);
@@ -614,66 +623,7 @@ GlyphSet::ImplDrawText (PrinterGfx rGfx, const Point
rPoint,
return;
}
-sal_uChar *pGlyphID= (sal_uChar*)alloca (nLen * sizeof(sal_uChar));
-sal_Int32 *pGlyphSetID = (sal_Int32*)alloca (nLen * sizeof(sal_Int32));
-std::set sal_Int32 aGlyphSet;
-
-// convert unicode to font glyph id and font subset
-for (int nChar = 0; nChar nLen; nChar++)
-{
-GetCharID (pStr[nChar], pGlyphID + nChar, pGlyphSetID + nChar);
-aGlyphSet.insert (pGlyphSetID[nChar]);
-}
-
-// loop over all glyph sets to detect substrings that can be xshown
together
-// without changing the postscript font
-sal_Int32 *pDeltaSubset = (sal_Int32*)alloca (nLen * sizeof(sal_Int32));
-sal_uChar *pGlyphSubset = (sal_uChar*)alloca (nLen * sizeof(sal_uChar));
-
-std::set sal_Int32 ::iterator aSet;
-for (aSet = aGlyphSet.begin(); aSet != aGlyphSet.end(); ++aSet)
-{
-Point aPoint = rPoint;
-sal_Int32 nOffset = 0;
-sal_Int32 nGlyphs = 0;
-sal_Int32 nChar;
-
-// get offset to first glyph
-for (nChar = 0; (nChar nLen) (pGlyphSetID[nChar] != *aSet);
nChar++)
-{
-nOffset = pDeltaArray [nChar];
-}
-
-// loop over all chars to extract those that share the current glyph
set
-for (nChar = 0; nChar nLen; nChar++)
-{
-if (pGlyphSetID[nChar] == *aSet)
-{
-pGlyphSubset [nGlyphs] = pGlyphID [nChar];
-// the offset to the next glyph is determined by the glyph in
-// front of the next glyph with the same glyphset id
-// most often, this will be the current glyph
-while ((nChar + 1) nLen)
-{
-if (pGlyphSetID[nChar + 1] == *aSet)
-break;
-else
-nChar += 1;
-}
-pDeltaSubset [nGlyphs] = pDeltaArray[nChar] - nOffset;
-
-nGlyphs += 1;
-}
-}
-
-// show the text using the PrinterGfx text api
-aPoint.Move (nOffset, 0);
-
-OString aGlyphSetName(GetCharSetName(*aSet));
-rGfx.PSSetFont (aGlyphSetName, GetGlyphSetEncoding(*aSet));
-rGfx.PSMoveTo (aPoint);
-rGfx.PSShowText (pGlyphSubset, nGlyphs, nGlyphs, nGlyphs 1 ?
pDeltaSubset : NULL);
-}
+DrawGlyphs( rGfx, rPoint, NULL, pStr, nLen, pDeltaArray, sal_False);
}
sal_Bool
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index d2d5a3f..1d6eb6f 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -121,7 +121,8 @@ public:
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++-
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit c8d9f6461c9dcb6280635ffa46686a45f507486f
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 20 15:46:08 2012 +0100
n#695479 fix rtf/docx import of transparent frames
Previously all frames were opaque by default, which is the Writer but
not the docx/rtf default. Change the default, while keeping the
possibility to set an opaque color background for the frame.
(cherry picked from commits 4ac48167662c592c21025b89fe8f6925c680c6e0 and
c306532e0bed1df36abf5d7ad6f0363056e69739)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d36fda0..bc38966 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -702,7 +702,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
StyleSheetEntryPtr pParaStyle =
GetStyleSheetTable()-FindStyleSheetByConvertedStyleName(rAppendContext.pLastParagraphProperties-GetParaStyleName());
-uno::Sequence beans::PropertyValue aFrameProperties(pParaStyle
? 15: 9);
+uno::Sequence beans::PropertyValue aFrameProperties(pParaStyle
? 16: 9);
if ( pParaStyle.get( ) )
{
@@ -722,6 +722,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pFrameProperties[12].Name =
rPropNameSupplier.GetName(PROP_RIGHT_MARGIN);
pFrameProperties[13].Name =
rPropNameSupplier.GetName(PROP_TOP_MARGIN);
pFrameProperties[14].Name =
rPropNameSupplier.GetName(PROP_BOTTOM_MARGIN);
+pFrameProperties[15].Name =
rPropNameSupplier.GetName(PROP_BACK_COLOR_TRANSPARENCY);
const ParagraphProperties* pStyleProperties =
dynamic_castconst ParagraphProperties*( pParaStyle-pProperties.get() );
sal_Int32 nWidth =
@@ -794,6 +795,10 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pStyleProperties-GetvSpace() = 0 ?
pStyleProperties-GetvSpace() : 0;
pFrameProperties[13].Value = nHoriOrient ==
text::HoriOrientation::LEFT ? 0 : nLeftDist;
pFrameProperties[14].Value = nHoriOrient ==
text::HoriOrientation::RIGHT ? 0 : nRightDist;
+// If there is no fill, the Word default is 100% transparency.
+// Otherwise CellColorHandler has priority, and this setting
+// will be ignored.
+pFrameProperties[15].Value = sal_Int32(100);
lcl_MoveBorderPropertiesToFrame(aFrameProperties,
rAppendContext.pLastParagraphProperties-GetStartingRange(),
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 173be40..c8f8a55 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -196,6 +196,7 @@ const rtl::OUString PropertyNameSupplier::GetName(
PropertyIds eId ) const
case PROP_CONTOUR_POLY_POLYGON :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ContourPolyPolygon)); break;
case PROP_PAGE_TOGGLE :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PageToggle)); break;
case PROP_BACK_COLOR :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BackColor)); break;
+case PROP_BACK_COLOR_TRANSPARENCY: sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BackColorTransparency)); break;
case PROP_ALTERNATIVE_TEXT :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(AlternativeText)); break;
case PROP_HEADER_TEXT_LEFT :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(HeaderTextLeft)); break;
case PROP_HEADER_TEXT :sName =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(HeaderText)); break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index dd20f06..b109cd6 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -51,6 +51,7 @@ enum PropertyIds
,PROP_ANCHOR_TYPE
,PROP_AUTOMATIC_DISTANCE
,PROP_BACK_COLOR
+,PROP_BACK_COLOR_TRANSPARENCY
,PROP_BITMAP
,PROP_BOTTOM_BORDER
,PROP_BOTTOM_BORDER_DISTANCE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin tail_build/README
solenv/bin/build.pl |6 +-
tail_build/README |4
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 10512ce508e4000e7438738c789421fd0bce2772
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 28 14:54:28 2012 +
build.pl: add a warning about the cost of: make tail_build.clean
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 31e0f73..9d9bcd7 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1514,7 +1514,11 @@ sub cancel_build {
print STDERR
---\n;
print STDERR To rebuild a specific module:\n;
print STDERR \n;
-print STDERR $ENV{GNUMAKE} $module.clean #optional\n;
+if ($module eq 'tail_build') {
+ print STDERR $ENV{GNUMAKE} $module.clean # not recommended, this will
re-build almost everything\n;
+} else {
+ print STDERR $ENV{GNUMAKE} $module.clean # optional\n;
+}
print STDERR $ENV{GNUMAKE} $module\n;
print STDERR \n;
print STDERR when the problem is isolated and fixed, re-run
'$ENV{GNUMAKE}'\n;
diff --git a/tail_build/README b/tail_build/README
index 4e29fb1..88ff437 100644
--- a/tail_build/README
+++ b/tail_build/README
@@ -15,3 +15,7 @@ To migrate a module foo under tail_build, one should:
* remove the module foo from postprocess/prj/build.lst dependencies
* remove the module foo from tail_build/prj/build.lst dependencies
* add the module name in Module_tail_build.mk at the root of bootstrap
+
+This module of course, takes a lot of thought, and dependency work /
+statting until it has finished it's business, knows exactly what to
+re-build, and can start building just that.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6c0f9cc00e81862e888b680a83bd14c0f16811aa
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Feb 27 16:26:39 2012 +0400
fdo#31966: do not create an empty slide when printing handouts
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 758e5ed..64cd478 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1967,8 +1967,8 @@ private:
// Create a printer page when we have found one page for each
// placeholder or when this is the last (and special) loop.
-if (aPageIndices.size() == nShapeCount
-|| nIndex==nCount)
+if (!aPageIndices.empty()
+(aPageIndices.size() == nShapeCount || nIndex == nCount))
{
maPrinterPages.push_back(
::boost::shared_ptrPrinterPage(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.Android README.cross
README.Android |2 +- README.cross |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 739252d04397a4fcf3f044de86e3bfaec0084c4d Author: Michael Meeks michael.me...@suse.com Date: Mon Feb 27 14:16:54 2012 + android: remove obsolete sourcing of Env.Host.sh advice diff --git a/README.Android b/README.Android index e96597e..be1d765 100644 --- a/README.Android +++ b/README.Android @@ -15,7 +15,7 @@ Then it is necessary to get stdout/err to go to somewhere we can find it: Then: - . Env.Host.sh + make cmd cmd=bash cd android/qa/sc make clean all install make run ; adb shell logcat diff --git a/README.cross b/README.cross index a1edd27..e2b9f21 100644 --- a/README.cross +++ b/README.cross @@ -387,7 +387,7 @@ The activity used for these apps is in android/Bootstrap. See README.Android. To build the complex unit test (for Calc functionality; invokes the -ucalc unit test code from sc) source the environment (. Env.Host.sh) +ucalc unit test code from sc) setup your environment (make cmd cmd=bash) and cd to android/qa/sc and run a make. The Makefile here is completely manually written, this stuff is so experimental it doesn't make sense yet to try to integrate with the normal gbuild ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: avmedia/source offapi/com
avmedia/source/gstreamer/gstplayer.cxx | 26 -
avmedia/source/gstreamer/gstplayer.hxx |3 --
avmedia/source/quicktime/player.hxx|3 --
avmedia/source/quicktime/player.mm | 34 -
avmedia/source/win/player.cxx | 31 --
avmedia/source/win/player.hxx |3 --
offapi/com/sun/star/media/XPlayer.idl | 20 ---
7 files changed, 120 deletions(-)
New commits:
commit 55d52165df003d253d813f3ea7085f4d89fdb3ce
Author: Bartolomé Sánchez Salado aliaselba...@gmail.com
Date: Sat Feb 25 19:34:35 2012 +0100
Removed unused code.
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index fa1dcbd..ee54965 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -396,32 +396,6 @@ double SAL_CALL Player::getMediaTime( )
//
--
-void SAL_CALL Player::setStopTime( double /*fTime*/ )
-throw (uno::RuntimeException)
-{
-// TODO implement
-}
-
-//
--
-
-double SAL_CALL Player::getStopTime( )
-throw (uno::RuntimeException)
-{
-// Get the time at which to stop
-
-return 0;
-}
-
-//
--
-
-void SAL_CALL Player::setRate( double /*fRate*/ )
-throw (uno::RuntimeException)
-{
-// TODO set the window rate
-}
-
-//
--
-
double SAL_CALL Player::getRate( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/gstreamer/gstplayer.hxx
b/avmedia/source/gstreamer/gstplayer.hxx
index 0e04d67..b5d7d83 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -62,9 +62,6 @@ public:
virtual double SAL_CALL getDuration( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMediaTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getMediaTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setStopTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
-virtual double SAL_CALL getStopTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setRate( double fRate ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getRate( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw
(::com::sun::star::uno::RuntimeException);
diff --git a/avmedia/source/quicktime/player.hxx
b/avmedia/source/quicktime/player.hxx
index da9bbfc..ec795fd 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -59,9 +59,6 @@ public:
virtual double SAL_CALL getDuration( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMediaTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getMediaTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setStopTime( double fTime ) throw
(::com::sun::star::uno::RuntimeException);
-virtual double SAL_CALL getStopTime( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setRate( double fRate ) throw
(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getRate( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw
(::com::sun::star::uno::RuntimeException);
diff --git a/avmedia/source/quicktime/player.mm
b/avmedia/source/quicktime/player.mm
index e4550a0..15c39e9 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -226,40 +226,6 @@ double SAL_CALL Player::getMediaTime( )
//
--
-void SAL_CALL Player::setStopTime( double fTime )
-throw (uno::RuntimeException)
-{
-OSL_TRACE (Player::setStopTime %f, fTime);
-
-mnStopTime = fTime;
-}
-
-//
--
-
-double SAL_CALL Player::getStopTime( )
-throw (uno::RuntimeException)
-{
-double fRet = mnStopTime;
-
-return fRet;
-}
-
-//
--
-
-void SAL_CALL Player::setRate( double fRate )
-throw (uno::RuntimeException)
-{
-OSL_TRACE (Player::setRate);
-
-// Quicktime: 0 = stop, 1 =
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d281971d62cc52c496487933ec699605f1a9b209
Author: Cameron Paul cpau...@gmail.com
Date: Mon Feb 27 15:56:03 2012 +
fdo#46438 - add ctrl-g / ctrl-shift-g binding for find again fwd/back
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 16d4d55..c974a22 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -133,6 +133,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
sal_Bool bShift = pKeyEvent-GetKeyCode().IsShift();
+sal_Bool bMod1 = pKeyEvent-GetKeyCode().IsMod1();
sal_uInt16 nCode = pKeyEvent-GetKeyCode().GetCode();
if ( KEY_ESCAPE == nCode )
@@ -156,7 +157,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
}
}
-if ( KEY_RETURN == nCode )
+if ( KEY_RETURN == nCode || (bMod1 (KEY_G == nCode)) )
{
Remember_Impl(GetText());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/dialogs/SpellDialog.cxx | 175 ++---
1 file changed, 86 insertions(+), 89 deletions(-)
New commits:
commit c2c65d4f30cddb0528e8e9ef24e3d42a68ada25c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Feb 27 17:00:40 2012 +0100
fdo#46531: Fixed SpellCheck dialog display issues
More robust, handling of the explanations message and link display.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index cb68f6b..feb6a7e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -403,6 +403,92 @@ void SpellDialog::UpdateBoxes_Impl()
aIgnoreRulePB.Enable(pSpellErrorDescription
pSpellErrorDescription-sRuleId.getLength());
aAutoCorrPB.Show( bShowChangeAll rParent.HasAutoCorrection() );
+bool bHasGrammarChecking = rParent.HasGrammarChecking();
+aCheckGrammarCB.Show( bHasGrammarChecking );
+if( !bHasGrammarChecking )
+{
+//resize the dialog to hide the hidden area of the CheckBox
+Size aBackSize = aBackgroundGB.GetSizePixel();
+sal_Int32 nDiff = aBackgroundGB.GetPosPixel().Y() + aBackSize.Height()
+- aCheckGrammarCB.GetPosPixel().Y();
+aBackSize.Height() -= nDiff;
+aBackgroundGB.SetSizePixel(aBackSize);
+Button* aButtons[] = { aHelpPB, aOptionsPB, aUndoPB, aClosePB, 0 };
+sal_Int32 nButton = 0;
+while( aButtons[nButton])
+{
+Point aPos = aButtons[nButton]-GetPosPixel();
+aPos.Y() -= nDiff;
+aButtons[nButton]-SetPosPixel(aPos);
+++nButton;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() -= nDiff;
+SetSizePixel( aDlgSize );
+}
+else
+{
+bool bHasExplainLink = aExplainLink.GetURL().Len() != 0;
+aExplainLink.Show( bHasExplainLink );
+
+sal_Int32 nExplainWidth = aExplainLink.GetPosPixel().X() -
aExplainFT.GetPosPixel().X();
+if ( !bHasExplainLink )
+nExplainWidth += aExplainLink.GetSizePixel().Width();
+sal_Int32 nExplainHeight = aExplainFT.GetActualHeight();
+sal_Int32 nCurrentHeight = aExplainFT.GetSizePixel().Height();
+if( aExplainFT.GetText().Len() == 0 )
+{
+nExplainHeight = 0;
+aExplainFT.Hide();
+aExplainLink.Hide();
+}
+
+Size aCtlSize = aExplainFT.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aCtlSize.Width() = nExplainWidth;
+aExplainFT.SetSizePixel( aCtlSize );
+
+aCtlSize = aExplainLink.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aExplainLink.SetSizePixel( aCtlSize );
+
+sal_Int32 nDiff = - ( nCurrentHeight - nExplainHeight );
+if ( nDiff != 0 )
+{
+Control* aControls[] = {
+aNotInDictFT,
+aSentenceED,
+aSuggestionFT,
+aSuggestionLB,
+aIgnorePB,
+aIgnoreAllPB,
+aIgnoreRulePB,
+aAddToDictMB,
+aChangePB,
+aChangeAllPB,
+aAutoCorrPB,
+aCheckGrammarCB,
+aHelpPB,
+aOptionsPB,
+aUndoPB,
+aClosePB,
+aBackgroundGB,
+0
+};
+sal_Int32 nControl = 0;
+while( aControls[nControl])
+{
+Point aPos = aControls[nControl]-GetPosPixel();
+aPos.Y() += nDiff;
+aControls[nControl]-SetPosPixel(aPos);
+++nControl;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() += nDiff;
+SetSizePixel( aDlgSize );
+Invalidate();
+}
+}
}
// ---
@@ -469,95 +555,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *,
EMPTYARG )
pThis-aClosePB.GrabFocus();
pThis-LockFocusChanges(false);
//show grammar CheckBox depending on the modules abilities
-bool bHasGrammarChecking = pThis-rParent.HasGrammarChecking();
-pThis-aCheckGrammarCB.Show( bHasGrammarChecking );
-if( !bHasGrammarChecking )
-{
-//resize the dialog to hide the hidden area of the CheckBox
-Size aBackSize = pThis-aBackgroundGB.GetSizePixel();
-sal_Int32 nDiff = pThis-aBackgroundGB.GetPosPixel().Y() +
aBackSize.Height()
-- pThis-aCheckGrammarCB.GetPosPixel().Y();
-aBackSize.Height() -= nDiff;
-pThis-aBackgroundGB.SetSizePixel(aBackSize);
-Button* aButtons[] = { pThis-aHelpPB, pThis-aOptionsPB,
pThis-aUndoPB, pThis-aClosePB, 0 };
-sal_Int32 nButton = 0;
-while( aButtons
[Libreoffice-commits] .: sw/source tools/inc
sw/source/ui/envelp/labfmt.cxx |2 +- tools/inc/tools/color.hxx |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit a3b0be108677c60653eb79187a45bbd447d5e21b Author: Winfried Donkers o...@dci-electronics.nl Date: Mon Feb 27 16:21:33 2012 +0100 fdo44516 cleanup of direct use of color in code diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 6ec2a79..d5208dd 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -173,7 +173,7 @@ void SwLabPreview::Paint(const Rectangle ) // Labels SetClipRegion (Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))); -SetFillColor( Color( 0xE0, 0xE0, 0xFF ) ); +SetFillColor( COL_LIGHTGRAYBLUE ); for (sal_uInt16 nRow = 0; nRow Min((sal_uInt16) 2, (sal_uInt16) aItem.nRows); nRow++) for (sal_uInt16 nCol = 0; nCol Min((sal_uInt16) 2, (sal_uInt16) aItem.nCols); nCol++) DrawRect(Rectangle( diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx index a9fe589..4594de6 100644 --- a/tools/inc/tools/color.hxx +++ b/tools/inc/tools/color.hxx @@ -74,6 +74,7 @@ typedef sal_uInt32 ColorData; #define COL_LIGHTCYAN RGB_COLORDATA( 0x00, 0xFF, 0xFF ) #define COL_LIGHTREDRGB_COLORDATA( 0xFF, 0x00, 0x00 ) #define COL_LIGHTMAGENTARGB_COLORDATA( 0xFF, 0x00, 0xFF ) +#define COL_LIGHTGRAYBLUE RGB_COLORDATA( 0xE0, 0xE0, 0xFF ) #define COL_YELLOW RGB_COLORDATA( 0xFF, 0xFF, 0x00 ) #define COL_WHITE RGB_COLORDATA( 0xFF, 0xFF, 0xFF ) #define COL_TRANSPARENT TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 207dbaaf83a9955f0b02978551340080ddac10cc Author: Fernando Governatore affql...@gmail.com Date: Sat Feb 25 15:22:08 2012 -0200 fix icecc compile in ubuntu In ubuntu the GCC_HOME of icecc is in /usr/lib/icecc diff --git a/configure.in b/configure.in index fe35ab3..8271431 100644 --- a/configure.in +++ b/configure.in @@ -2167,7 +2167,11 @@ GCC_HOME_SET=true AC_MSG_CHECKING([gcc home]) if test -z $with_gcc_home; then if test $enable_icecream = yes ; then -GCC_HOME=/opt/icecream +if test -d /usr/lib/icecc/ ; then +GCC_HOME=/usr/lib/icecc/ +else +GCC_HOME=/opt/icecream/ +fi else GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` GCC_HOME_SET=false ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/android'
New branch 'feature/android' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/android vcl/headless vcl/inc vcl/unx
vcl/android/androidinst.cxx | 89 +---
vcl/headless/svpframe.cxx | 39 +
vcl/headless/svpinst.cxx|5 +-
vcl/inc/android/androidinst.hxx |5 +-
vcl/inc/headless/svpframe.hxx | 11
vcl/inc/unx/gtk/gtkframe.hxx|2
vcl/unx/gtk/window/gtkframe.cxx |4 +
7 files changed, 136 insertions(+), 19 deletions(-)
New commits:
commit 9ab611a652334a98ba7922ee6a53b61bbcc4892f
Author: Michael Meeks michael.me...@suse.com
Date: Sat Feb 25 14:13:08 2012 +
android: move DamageTracker concept into SvpSalFrame and try to use it
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 94d5bbc..af78a22 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -35,6 +35,7 @@
#include osl/detail/android-bootstrap.h
#include osl/detail/android_native_app_glue.h
#include rtl/strbuf.hxx
+#include basebmp/scanlineformats.hxx
extern void VCL_DLLPUBLIC plasma_now(const char *msg);
@@ -203,7 +204,7 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer
*pOutBuffer,
const ARect rSrcRect,
int nDestX, int nDestY)
{
-fprintf (stderr, Blit frame #2 src %d,%d-%d,%d to position %d, %d\n,
+fprintf (stderr, Blit frame src %d,%d-%d,%d to position %d, %d\n,
rSrcRect.left, rSrcRect.top, rSrcRect.right, rSrcRect.bottom,
nDestX, nDestY);
@@ -215,11 +216,10 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer
*pOutBuffer,
// FIXME: do some cropping goodness on aSrcRect to ensure no overflows etc.
ARect aSrcRect = rSrcRect;
-// FIXME: we have WINDOW_FORMAT_RGB_565= 4 ...
-
+// FIXME: by default we have WINDOW_FORMAT_RGB_565 = 4 ...
for (unsigned int y = 0; y (unsigned int)(aSrcRect.bottom -
aSrcRect.top); y++)
{
-unsigned char *sp = ( pSrc + nStride * (aSrcRect.bottom - aSrcRect.top
- y - 1) +
+unsigned char *sp = ( pSrc + nStride * (aSrcRect.top + y) +
aSrcRect.left * 3 /* src pixel size */ );
switch (pOutBuffer-format) {
@@ -258,7 +258,6 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer
*pOutBuffer,
break;
}
}
-fprintf (stderr, done blit!\n);
}
void AndroidSalInstance::BlitFrameToWindow(ANativeWindow_Buffer *pOutBuffer,
@@ -288,7 +287,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow
*pWindow)
if (aOutBuffer.bits != NULL)
{
-#if 1 // pre-'clean' the buffer with cruft:
+#if 0 // pre-'clean' the buffer with cruft:
// hard-code / guess at a format ...
int32_t *p = (int32_t *)aOutBuffer.bits;
for (int32_t y = 0; y aOutBuffer.height; y++)
@@ -296,18 +295,42 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow
*pWindow)
for (int32_t x = 0; x aOutBuffer.stride; x++)
*p++ = (y 24) + (x 10) + 0xff ;
}
-#endif
+#endif
+int i = 0;
std::list SalFrame* ::const_iterator it;
-for ( it = getFrames().begin(); it != getFrames().end(); it++ )
+for ( it = getFrames().begin(); it != getFrames().end(); i++, it++ )
{
SvpSalFrame *pFrame = static_castSvpSalFrame *(*it);
if (pFrame-IsVisible())
{
-// FIXME: force a re-draw - this appears not to happen much
otherwis
-pFrame-PostPaint(true);
+fprintf( stderr, render visible frame %d\n, i );
+#ifndef REGION_RE_RENDER
BlitFrameToWindow (aOutBuffer, pFrame-getDevice());
+#else
+// Sadly it seems that due to double buffering, we don't
+// get back in our buffer what we had there last time - so we
cannot
+// do incremental rendering. Presumably this will require us to
+// render to a bitmap, and keep that updated instead in future.
+
+// Intersect re-rendering region with this frame
+Region aClipped( maRedrawRegion );
+basegfx::B2IVector aDevSize = pFrame-getDevice()-getSize();
+aClipped.Intersect( Rectangle( 0, 0, aDevSize.getX(),
aDevSize.getY() ) );
+
+Rectangle aSubRect;
+RegionHandle aHdl = aClipped.BeginEnumRects();
+while( aClipped.GetNextEnumRect( aHdl, aSubRect ) )
+{
+ARect aASubRect = { aSubRect.Left(), aSubRect.Top(),
+aSubRect.Right(), aSubRect.Bottom() };
+BlitFrameRegionToWindow(aOutBuffer, pFrame-getDevice(),
+aASubRect,
+aSubRect.Left(), aSubRect.Top());
+}
+aClipped.EndEnumRects( aHdl );
+#endif
}
}
}
@@ -316,9 +339,17 @@ void
[Libreoffice-commits] .: filter/inc filter/Library_msfilter.mk filter/Package_inc.mk filter/source sc/source sd/source sw/source
filter/Library_msfilter.mk|1 filter/Package_inc.mk |1 filter/inc/filter/msfilter/msdffimp.hxx |7 filter/inc/filter/msfilter/msfiltertracer.hxx | 97 -- filter/inc/filter/msfilter/svdfppt.hxx|4 filter/source/msfilter/msdffimp.cxx | 26 -- filter/source/msfilter/msfiltertracer.cxx | 230 -- filter/source/msfilter/svdfppt.cxx| 20 -- sc/source/filter/excel/xiescher.cxx |2 sc/source/filter/excel/xltracer.cxx | 13 - sc/source/filter/inc/xltracer.hxx |7 sd/source/filter/ppt/pptin.cxx| 17 - sd/source/filter/ppt/pptin.hxx|3 sd/source/filter/sdpptwrp.cxx |1 sw/source/filter/ww8/tracer.cxx | 76 sw/source/filter/ww8/tracer.hxx |3 sw/source/filter/ww8/ww8par.cxx |3 17 files changed, 16 insertions(+), 495 deletions(-) New commits: commit 168fc5c022538d287293bf933adde4b98c6aca37 Author: Szabolcs Dezsi dezsisz...@hotmail.com Date: Fri Feb 24 11:43:42 2012 +0100 Removed MSFilterTracer and all references to it diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 316a47d..e454dfb 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/eschesdo \ filter/source/msfilter/mscodec \ filter/source/msfilter/msdffimp \ - filter/source/msfilter/msfiltertracer \ filter/source/msfilter/msocximex \ filter/source/msfilter/msoleexp \ filter/source/msfilter/mstoolbar \ diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk index af2ade6..27a6c45 100644 --- a/filter/Package_inc.mk +++ b/filter/Package_inc.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/countryid.hxx,f $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/escherex.hxx,filter/msfilter/escherex.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mscodec.hxx,filter/msfilter/mscodec.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,filter/msfilter/msdffimp.hxx)) -$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfiltertracer.hxx,filter/msfilter/msfiltertracer.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,filter/msfilter/mstoolbar.hxx)) diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 1616adb..be40fda 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -37,7 +37,6 @@ #include tools/gen.hxx #include tools/table.hxx #include svx/msdffdef.hxx -#include filter/msfilter/msfiltertracer.hxx #include vcl/graph.hxx #include string.h #include map @@ -576,7 +575,6 @@ public: DffRecordManagermaShapeRecords; ColorData mnDefaultColor; -MSFilterTracer* mpTracer; sal_BoolmbTracing; Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const; @@ -619,12 +617,11 @@ public: long nApplicationScale= 0, ColorData mnDefaultColor_ = COL_DEFAULT, sal_uLong nDefaultFontHeight_ = 24, - SvStream* pStData2_= 0, - MSFilterTracer* pTracer= NULL ); + SvStream* pStData2_= 0 ); // in PPT werden die Parameter DGGContainerOffset und PicStream // mit Hilfe einer Init Routine Uebergeben. -SvxMSDffManager( SvStream rStCtrl, const String rBaseURL, MSFilterTracer* pTracer ); +SvxMSDffManager( SvStream rStCtrl, const String rBaseURL ); void InitSvxMSDffManager(sal_uInt32 nOffsDgg_, SvStream* pStData_, sal_uInt32 nSvxMSDffOLEConvFlags); void SetDgContainer( SvStream rSt ); diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx deleted file mode 100644 index e8fd049..000 --- a/filter/inc/filter/msfilter/msfiltertracer.hxx +++ /dev/null @@ -1,97 +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
[Libreoffice-commits] .: oox/source
oox/source/drawingml/textliststyle.cxx |2 +-
oox/source/drawingml/textparagraphproperties.cxx |2 +-
oox/source/helper/propertyset.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 602908b300d4d688d50355ebeca5d3063f25f475
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 11:19:56 2012 +
fix oox debug build with DBG_UTIL guard for 'dump' usage
diff --git a/oox/source/drawingml/textliststyle.cxx
b/oox/source/drawingml/textliststyle.cxx
index edd50f0..663a5d5 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -66,7 +66,7 @@ void TextListStyle::apply( const TextListStyle
rTextListStyle )
applyStyleList( rTextListStyle.getListStyle(), getListStyle() );
}
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
void TextListStyle::dump() const
{
for ( int i = 0; i 9; i++ )
diff --git a/oox/source/drawingml/textparagraphproperties.cxx
b/oox/source/drawingml/textparagraphproperties.cxx
index a916f45..6eea22f 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -467,7 +467,7 @@ float TextParagraphProperties::getCharHeightPoints( float
fDefault ) const
}
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
void TextParagraphProperties::dump() const
{
diff --git a/oox/source/helper/propertyset.cxx
b/oox/source/helper/propertyset.cxx
index 71f0d4e..e973318 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -178,7 +178,7 @@ bool PropertySet::implSetPropertyValue( const OUString
rPropName, const Any rV
return false;
}
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
void PropertySet::dump()
{
PropertyMap::dump( Reference XPropertySet ( getXPropertySet(), UNO_QUERY
) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - android/qa basic/source test/Package_unittest.mk test/user-template toolkit/source
android/qa/desktop/Makefile |4 +++
basic/source/inc/namecont.hxx|8 +++---
basic/source/uno/namecont.cxx| 39 ---
test/Package_unittest.mk |2 -
test/user-template/user/basic/dialog.xlc |4 ---
test/user-template/user/basic/script.xlc |4 ---
toolkit/source/awt/vclxtoolkit.cxx |8 +-
7 files changed, 26 insertions(+), 43 deletions(-)
New commits:
commit 1c7c2c032301247416d977af17ddd4183cd339f4
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 16:11:18 2012 +
test: remove, now redundant dummy dialog.xlc / script.xlc
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index ce48f68..b861c93 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -28,8 +28,6 @@
$(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template))
$(eval $(call
gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd))
-$(eval $(call
gb_Package_add_file,test_unittest,unittest/user/basic/dialog.xlc,user/basic/dialog.xlc))
-$(eval $(call
gb_Package_add_file,test_unittest,unittest/user/basic/script.xlc,user/basic/script.xlc))
$(eval $(call
gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic))
$(eval $(call
gb_Package_add_file,test_unittest,unittest/user/wordbook/en-US.dic,user/wordbook/en-US.dic))
$(eval $(call
gb_Package_add_file,test_unittest,unittest/user/wordbook/technical.dic,user/wordbook/technical.dic))
diff --git a/test/user-template/user/basic/dialog.xlc
b/test/user-template/user/basic/dialog.xlc
deleted file mode 100644
index aed4ac2..000
--- a/test/user-template/user/basic/dialog.xlc
+++ /dev/null
@@ -1,4 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE library:libraries PUBLIC -//OpenOffice.org//DTD OfficeDocument
1.0//EN libraries.dtd
-library:libraries xmlns:library=http://openoffice.org/2000/library;
xmlns:xlink=http://www.w3.org/1999/xlink;
-/library:libraries
diff --git a/test/user-template/user/basic/script.xlc
b/test/user-template/user/basic/script.xlc
deleted file mode 100644
index aed4ac2..000
--- a/test/user-template/user/basic/script.xlc
+++ /dev/null
@@ -1,4 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE library:libraries PUBLIC -//OpenOffice.org//DTD OfficeDocument
1.0//EN libraries.dtd
-library:libraries xmlns:library=http://openoffice.org/2000/library;
xmlns:xlink=http://www.w3.org/1999/xlink;
-/library:libraries
commit 3bc31727bb7107e770f48871cf7700a16e9bbc68
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 15:07:37 2012 +
android: package more useful sounding libraries
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 528174b..8c07351 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -121,6 +121,7 @@ copy-stuff: buildrcs
freetype \
fsstorage.uno \
gcc3_uno \
+ hypenlo \
i18nisolang1gcc3 \
i18npaperlo \
i18npool.uno \
@@ -132,6 +133,8 @@ copy-stuff: buildrcs
jvmaccessgcc3 \
jvmfwk \
lnglo \
+ introspection.uno \
+ lnth \
localebe1.uno \
localedata_en \
localedata_es \
@@ -146,6 +149,7 @@ copy-stuff: buildrcs
sclo \
scfiltlo \
sotlo \
+ spelllo \
stocservices.uno \
store \
svllo \
commit 63ac26703974f8481b112b1a881329fa7a8bca96
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 15:06:52 2012 +
toolkit: fix module name for svt to 'merged' when using mergedlibs
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 3a8e2c6..fe21cc6 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1094,7 +1094,13 @@ css::uno::Reference css::awt::XWindowPeer
VCLXToolkit::ImplCreateWindow(
// try to load the lib
if ( !fnSvtCreateWindow !hSvToolsLib )
{
-::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( svt,
sal_True );
+::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
+#ifdef LIBO_MERGELIBS
+
merged,
+#else
+ svt,
+#endif
+
sal_True );
hSvToolsLib = osl_loadModuleRelative(
thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hSvToolsLib )
commit 1543f1ec6deba898f71b04d242af8bed74dcd8d6
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 14:22:54 2012 +
[Libreoffice-commits] .: 2 commits - android/qa vcl/android
android/qa/desktop/Makefile |5 +++--
vcl/android/androidinst.cxx | 22 +-
2 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit c45e87d037ca11e6d173ab57fce295c5f01d2ccc
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 16:52:44 2012 +
android: more libs corrections
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 8c07351..490a7a8 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -121,7 +121,7 @@ copy-stuff: buildrcs
freetype \
fsstorage.uno \
gcc3_uno \
- hypenlo \
+ hyphenlo \
i18nisolang1gcc3 \
i18npaperlo \
i18npool.uno \
@@ -134,7 +134,7 @@ copy-stuff: buildrcs
jvmfwk \
lnglo \
introspection.uno \
- lnth \
+ lnthlo \
localebe1.uno \
localedata_en \
localedata_es \
@@ -170,6 +170,7 @@ copy-stuff: buildrcs
xstor \
\
swlo \
+ swuilo \
swdlo \
); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
commit b8f41e584cb876327c78e55bdfffb0424facfe41
Author: Michael Meeks michael.me...@suse.com
Date: Fri Feb 24 16:40:29 2012 +
android: get basic 0-9, a-z keyinput working
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 16a5125..94d5bbc 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -309,8 +309,6 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow
*pWindow)
pFrame-PostPaint(true);
BlitFrameToWindow (aOutBuffer, pFrame-getDevice());
}
-else // Sucky the frame is invisible - why !?
-fprintf (stderr, invisible frame\n);
}
}
else
@@ -435,12 +433,26 @@ int32_t AndroidSalInstance::onInputEvent (struct
android_app* app, AInputEvent*
SalKeyEvent aEvent;
int64_t nNsTime = AKeyEvent_getEventTime(event);
+// FIXME: really we need a Java wrapper app as Mozilla has that does
+// key event translation for us, and provides -much- cleaner events.
nEvent = (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_UP ?
SALEVENT_KEYUP : SALEVENT_KEYINPUT);
+sal_uInt16 nCode = KeyToCode(event);
+sal_uInt16 nMetaState = KeyMetaStateToCode(event);
+if (nCode = KEY_0 nCode = KEY_9)
+aEvent.mnCharCode = '0' + nCode - KEY_0;
+else if (nCode = KEY_A nCode = KEY_Z)
+aEvent.mnCharCode = (nMetaState KEY_SHIFT ? 'A' : 'a') + nCode -
KEY_A;
+else if (nCode == KEY_SPACE)
+aEvent.mnCharCode = ' ';
+else if (nCode == KEY_COMMA)
+aEvent.mnCharCode = ',';
+else if (nCode == KEY_POINT)
+aEvent.mnCharCode = '.';
+else
+aEvent.mnCharCode = 0;
aEvent.mnTime = nNsTime / (1000 * 1000);
-aEvent.mnCode = KeyToCode(event);
-aEvent.mnCode |= KeyMetaStateToCode(event);
-aEvent.mnCharCode = 'a'; // the unicode of it all ...
+aEvent.mnCode = nMetaState | nCode;
aEvent.mnRepeat = AKeyEvent_getRepeatCount(event);
SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 33 +++--
1 file changed, 15 insertions(+), 18 deletions(-)
New commits:
commit f881540b3295c17286f8003c7b897907bf9f57cb
Author: Catalin Iacob iacobcata...@gmail.com
Date: Thu Feb 23 12:57:22 2012 +
cppcheck: fix possible null dereference in ScMyCellInfo::CreateCell.
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 55140b1..4359929 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -63,26 +63,23 @@ ScMyCellInfo::~ScMyCellInfo()
ScBaseCell* ScMyCellInfo::CreateCell(ScDocument* pDoc)
{
-if (pDoc)
+if (!pCell !sFormula.isEmpty() !sFormulaAddress.isEmpty())
{
-if (!pCell !sFormula.isEmpty() !sFormulaAddress.isEmpty())
-{
-ScAddress aPos;
-sal_Int32 nOffset(0);
-ScRangeStringConverter::GetAddressFromString(aPos,
sFormulaAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset);
-pCell = new ScFormulaCell(pDoc, aPos, sFormula, eGrammar,
nMatrixFlag);
-
static_castScFormulaCell*(pCell)-SetMatColsRows(static_castSCCOL(nMatrixCols),
static_castSCROW(nMatrixRows));
-}
+ScAddress aPos;
+sal_Int32 nOffset(0);
+ScRangeStringConverter::GetAddressFromString(aPos, sFormulaAddress,
pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset);
+pCell = new ScFormulaCell(pDoc, aPos, sFormula, eGrammar, nMatrixFlag);
+
static_castScFormulaCell*(pCell)-SetMatColsRows(static_castSCCOL(nMatrixCols),
static_castSCROW(nMatrixRows));
+}
-if ((nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME)
sInputString.Len() == 0)
-{
-sal_uInt32 nFormat(0);
-if (nType == NUMBERFORMAT_DATE)
-nFormat = pDoc-GetFormatTable()-GetStandardFormat(
NUMBERFORMAT_DATE, ScGlobal::eLnge );
-else if (nType == NUMBERFORMAT_TIME)
-nFormat = pDoc-GetFormatTable()-GetStandardFormat(
NUMBERFORMAT_TIME, ScGlobal::eLnge );
-pDoc-GetFormatTable()-GetInputLineString(fValue, nFormat,
sInputString);
-}
+if ((nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME)
sInputString.Len() == 0)
+{
+sal_uInt32 nFormat(0);
+if (nType == NUMBERFORMAT_DATE)
+nFormat = pDoc-GetFormatTable()-GetStandardFormat(
NUMBERFORMAT_DATE, ScGlobal::eLnge );
+else if (nType == NUMBERFORMAT_TIME)
+nFormat = pDoc-GetFormatTable()-GetStandardFormat(
NUMBERFORMAT_TIME, ScGlobal::eLnge );
+pDoc-GetFormatTable()-GetInputLineString(fValue, nFormat,
sInputString);
}
return pCell ? pCell-CloneWithoutNote( *pDoc ) : 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: salhelper/source
salhelper/source/gcc3.map |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 6aace905c0929adf79d0cfa146f168d75cc2e953
Author: Michael Meeks michael.me...@suse.com
Date: Thu Feb 23 14:27:29 2012 +
add ia32 non-virtual thunks to linker map
diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map
index c356dc6..8f08ec9 100644
--- a/salhelper/source/gcc3.map
+++ b/salhelper/source/gcc3.map
@@ -108,10 +108,12 @@ LIBO_UDK_3.6 { # symbols available in = LibO 3.6
_ZN9salhelper6ThreadD1Ev; # salhelper::Thread::~Thread()
_ZN9salhelper6ThreadD2Ev; # salhelper::Thread::~Thread()
_ZTVN9salhelper6ThreadE; # vtable for salhelper::Thread
+ # non-virtual thunk to salhelper::Thread::onTerminated()
_ZThn16_N9salhelper6Thread12onTerminatedEv;
-# non-virtual thunk to salhelper::Thread::onTerminated()
+ _ZThn8_N9salhelper6Thread12onTerminatedEv;
+# non-virtual thunk to salhelper::Thread::run()
+ _ZThn8_N9salhelper6Thread3runEv;
_ZThn16_N9salhelper6Thread3runEv;
-# non-virtual thunk to salhelper::Thread::run()
} UDK_3.1;
# Unique libstdc++ symbols:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source svtools/source svx/source sw/source
sc/source/ui/src/popup.src |6 ++
svtools/source/graphic/grfmgr.cxx |5 +
svtools/source/graphic/provider.cxx |3 +++
svx/source/xml/xmlgrhlp.cxx |5 +
sw/source/core/graphic/ndgrf.cxx| 33 +
5 files changed, 52 insertions(+)
New commits:
commit aff6db70245a74039b5331810d3ff654b1f6af63
Author: Greggory Hernandez greggory...@gmail.com
Date: Wed Feb 22 14:08:57 2012 +
fdo#37210 - UI: Calc usability improvement: Merge cells on right mouse click
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 24e9c58..441c336 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -76,6 +76,12 @@ Menu RID_POPUP_CELLS
HelpId = CMD_SID_DELETE ;
Text [ en-US ] = Delete C~ontents... ;
};
+MenuItem
+{
+Identifier = FID_MERGE_ON ;
+HelpId = CMD_FID_MERGE_ON ;
+Text [ en-US ] = ~Merge Cells... ;
+};
//--
MenuItem { Separator = TRUE ; };
//--
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 7c2de86..2124d62 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -422,12 +422,17 @@ String GraphicObject::GetLink() const
void GraphicObject::SetUserData()
{
+fprintf (stderr, SetUserData to null from '%s'\n,
+ mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
if( mpUserData )
delete mpUserData, mpUserData = NULL;
}
void GraphicObject::SetUserData( const String rUserData )
{
+fprintf (stderr, SetUserData to '%s' from '%s'\n,
+ rtl::OUStringToOString(rUserData, RTL_TEXTENCODING_UTF8).getStr(),
+ mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
delete mpUserData, mpUserData = new String( rUserData );
}
diff --git a/svtools/source/graphic/provider.cxx
b/svtools/source/graphic/provider.cxx
index d5bcf46..185e9dc 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -867,6 +867,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
if( pGraphic ( pGraphic-GetType() != GRAPHIC_NONE ) )
{
+fprintf (stderr, provider.cxx - write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
::Graphic aGraphic( *pGraphic );
ImplApplyFilterData( aGraphic, aFilterDataSeq );
@@ -884,6 +885,8 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
}
aMemStrm.Seek( STREAM_SEEK_TO_END );
pOStm-Write( aMemStrm.GetData(), aMemStrm.Tell() );
+
+fprintf (stderr, provider.cxx - after write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
}
}
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index d73c19e..9f2c6c8 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -621,6 +621,8 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
}
else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE )
{
+fprintf (stderr, xmlgrhlp.cxx - write meta-file !
0x%lx\n,
+ (long)aGraphic.GetChecksum() );
pStream-SetVersion( SOFFICE_FILEFORMAT_8 );
pStream-SetCompressMode( COMPRESSMODE_ZBITMAP );
@@ -643,6 +645,9 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
rMtf.Write( *pStream,
GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC );
bRet = ( pStream-GetError() == 0 );
+
+fprintf (stderr, xmlgrhlp.cxx - done write meta-file !
0x%lx\n,
+ (long)aGraphic.GetChecksum() );
}
}
uno::Reference embed::XTransactedObject xStorage(
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 151d795..907e1f0 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -63,6 +63,14 @@
using namespace com::sun::star;
+static void dbg (SwGrfNode *pNode)
+{
+fprintf (stderr, SwGrfNode created: '%s' 0x%lx\n,
+ rtl::OUStringToOString(pNode-GetGrfObj().GetUserData(),
+RTL_TEXTENCODING_UTF8).getStr(),
+ (long)pNode-GetGrf().GetChecksum());
+}
+
//
// SwGrfNode
//
@@ -83,6 +91,7 @@ SwGrfNode::SwGrfNode(
bGrafikArrived = sal_True;
ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
+
[Libreoffice-commits] .: svtools/source svx/source sw/source
svtools/source/graphic/grfmgr.cxx |5 -
svtools/source/graphic/provider.cxx |3 ---
svx/source/xml/xmlgrhlp.cxx |5 -
sw/source/core/graphic/ndgrf.cxx| 33 -
4 files changed, 46 deletions(-)
New commits:
commit fdb9d721c18fb3c3f81f7384ad544e72e969f448
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 22 14:24:52 2012 +
revert slew of debug code committed in error
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 2124d62..7c2de86 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -422,17 +422,12 @@ String GraphicObject::GetLink() const
void GraphicObject::SetUserData()
{
-fprintf (stderr, SetUserData to null from '%s'\n,
- mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
if( mpUserData )
delete mpUserData, mpUserData = NULL;
}
void GraphicObject::SetUserData( const String rUserData )
{
-fprintf (stderr, SetUserData to '%s' from '%s'\n,
- rtl::OUStringToOString(rUserData, RTL_TEXTENCODING_UTF8).getStr(),
- mpUserData ? rtl::OUStringToOString(*mpUserData,
RTL_TEXTENCODING_UTF8).getStr() : null);
delete mpUserData, mpUserData = new String( rUserData );
}
diff --git a/svtools/source/graphic/provider.cxx
b/svtools/source/graphic/provider.cxx
index 185e9dc..d5bcf46 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -867,7 +867,6 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
if( pGraphic ( pGraphic-GetType() != GRAPHIC_NONE ) )
{
-fprintf (stderr, provider.cxx - write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
::Graphic aGraphic( *pGraphic );
ImplApplyFilterData( aGraphic, aFilterDataSeq );
@@ -885,8 +884,6 @@ void SAL_CALL GraphicProvider::storeGraphic( const
uno::Reference ::graphic::XG
}
aMemStrm.Seek( STREAM_SEEK_TO_END );
pOStm-Write( aMemStrm.GetData(), aMemStrm.Tell() );
-
-fprintf (stderr, provider.cxx - after write graphic: !
0x%lx\n, (long)pGraphic-GetChecksum() );
}
}
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 9f2c6c8..d73c19e 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -621,8 +621,6 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
}
else if( aGraphic.GetType() == GRAPHIC_GDIMETAFILE )
{
-fprintf (stderr, xmlgrhlp.cxx - write meta-file !
0x%lx\n,
- (long)aGraphic.GetChecksum() );
pStream-SetVersion( SOFFICE_FILEFORMAT_8 );
pStream-SetCompressMode( COMPRESSMODE_ZBITMAP );
@@ -645,9 +643,6 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const
::rtl::OUString rPictureSt
rMtf.Write( *pStream,
GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC );
bRet = ( pStream-GetError() == 0 );
-
-fprintf (stderr, xmlgrhlp.cxx - done write meta-file !
0x%lx\n,
- (long)aGraphic.GetChecksum() );
}
}
uno::Reference embed::XTransactedObject xStorage(
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 907e1f0..151d795 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -63,14 +63,6 @@
using namespace com::sun::star;
-static void dbg (SwGrfNode *pNode)
-{
-fprintf (stderr, SwGrfNode created: '%s' 0x%lx\n,
- rtl::OUStringToOString(pNode-GetGrfObj().GetUserData(),
-RTL_TEXTENCODING_UTF8).getStr(),
- (long)pNode-GetGrf().GetChecksum());
-}
-
//
// SwGrfNode
//
@@ -91,7 +83,6 @@ SwGrfNode::SwGrfNode(
bGrafikArrived = sal_True;
ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
-dbg(this);
}
SwGrfNode::SwGrfNode( const SwNodeIndex rWhere,
@@ -109,7 +100,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex rWhere,
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
bFrameInPaint = bScaleImageMap = sal_False;
bGrafikArrived = sal_True;
-dbg(this);
}
// Konstruktor fuer den SW/G-Reader. Dieser ctor wird verwendet,
@@ -145,7 +135,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex rWhere,
((SwBaseLink*)refLink)-Connect();
}
}
-dbg(this);
}
sal_Bool SwGrfNode::ReRead(
@@ -398,9 +387,6 @@ sal_Bool SwGrfNode::ImportGraphic( SvStream rStrm )
const String aGraphicURL( aGrfObj.GetUserData
[Libreoffice-commits] .: sw/source
sw/source/filter/xml/xmltexte.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0389b77a3cbea09ddbae238d7934d4c6349a8d37
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 22 16:05:47 2012 +
fdo#33393 - tentative workaround for autosave image loss
cf. lengthy analysis in the bug, this appears to merit wider testing
for 3.5.1 RC1 and wouldn't be sensible without that, so commit early.
diff --git a/sw/source/filter/xml/xmltexte.cxx
b/sw/source/filter/xml/xmltexte.cxx
index c62bce3..5c89944 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -221,7 +221,9 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
{
String aNewURL( RTL_CONSTASCII_USTRINGPARAM(vnd.sun.star.Package:) );
aNewURL += String(rURL);
-pGrfNd-SetNewStreamName( aNewURL );
+
+// This is nonsensical.
+//pGrfNd-SetNewStreamName( aNewURL );
// #i15411# save-as will swap all graphics in; we need to swap
// them out again, to prevent excessive memory use
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
