[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mysql/YDriver.cxx | 36 ++
1 file changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 63897351fc4fd31305bef43b649be74e2b6006c4
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 09:01:01 2013 +0200
rhbz#989246: Honor user's JavaDriverClass override in mysql driver
Change-Id: Ic7dbddb5b17af0bd23864fd19ab2bd815969d008
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx
b/connectivity/source/drivers/mysql/YDriver.cxx
index dd8c36d..c02a54e 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -49,6 +49,15 @@ namespace connectivity
}
}
+namespace
+{
+OUString getJavaDriverClass(
+css::uno::Sequencecss::beans::PropertyValue const info)
+{
+return comphelper::NamedValueCollection(info).getOrDefault(
+JavaDriverClass, OUString(com.mysql.jdbc.Driver));
+}
+}
//
//= ODriverDelegator
@@ -156,9 +165,14 @@ namespace connectivity
const PropertyValue* pEnd = pSupported + info.getLength();
aProps.reserve(info.getLength() + 5);
+bool jdc = false;
for (;pSupported != pEnd; ++pSupported)
{
aProps.push_back( *pSupported );
+if (pSupported-Name == JavaDriverClass)
+{
+jdc = true;
+}
}
if ( _eType == D_ODBC )
@@ -176,11 +190,14 @@ namespace connectivity
}
else if ( _eType == D_JDBC )
{
-aProps.push_back( PropertyValue(
-OUString(JavaDriverClass)
-,0
-,makeAny(OUString(com.mysql.jdbc.Driver))
-,PropertyState_DIRECT_VALUE) );
+if (!jdc)
+{
+aProps.push_back( PropertyValue(
+ OUString(JavaDriverClass)
+ ,0
+
,makeAny(OUString(com.mysql.jdbc.Driver))
+ ,PropertyState_DIRECT_VALUE) );
+}
}
else
{
@@ -229,10 +246,7 @@ namespace connectivity
}
else
{
-::comphelper::NamedValueCollection aSettings( info );
-OUString sDriverClass(com.mysql.jdbc.Driver);
-sDriverClass = aSettings.getOrDefault( JavaDriverClass,
sDriverClass );
-
+OUString sDriverClass(getJavaDriverClass(info));
TJDBCDrivers::iterator aFind = m_aJdbcDrivers.find(sDriverClass);
if ( aFind == m_aJdbcDrivers.end() )
aFind =
m_aJdbcDrivers.insert(TJDBCDrivers::value_type(sDriverClass,lcl_loadDriver(m_xContext,sCuttedUrl))).first;
@@ -318,7 +332,7 @@ namespace connectivity
}
//
-Sequence DriverPropertyInfo SAL_CALL ODriverDelegator::getPropertyInfo(
const OUString url, const Sequence PropertyValue /*info*/ ) throw
(SQLException, RuntimeException)
+Sequence DriverPropertyInfo SAL_CALL ODriverDelegator::getPropertyInfo(
const OUString url, const Sequence PropertyValue info ) throw
(SQLException, RuntimeException)
{
::std::vector DriverPropertyInfo aDriverInfo;
if ( !acceptsURL(url) )
@@ -350,7 +364,7 @@ namespace connectivity
OUString(JavaDriverClass)
,OUString(The JDBC driver class name.)
,sal_True
-,OUString(com.mysql.jdbc.Driver)
+,getJavaDriverClass(info)
,Sequence OUString ())
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a9d91b76d472e076f9a9c9985dbf7cc13c984a25 Author: Tor Lillqvist t...@iki.fi Date: Tue Jul 30 10:05:13 2013 +0300 Accept also 4.8 Change-Id: I121ff292050e9e90e298ed44705b6408c0d2f089 diff --git a/configure.ac b/configure.ac index 53acedc..562d463 100644 --- a/configure.ac +++ b/configure.ac @@ -182,7 +182,7 @@ if test -n $with_android_ndk; then fi case $with_android_ndk_toolchain_version in -4.6|4.7) +4.6|4.7|4.8) ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR ;; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Mirroring gtk buttons
On Wed, Mar 06, 2013 at 04:50:43PM +, Caolán McNamara wrote:
On Wed, 2013-03-06 at 17:52 +0200, Khaled Hosny wrote:
The default direction of GTK widgets is locale dependant; it is set by a
string in GTK's gettext catalogue, so if we can somehow trick GTK to use
the same locale as LibreOffice UI, that would be a solution.
See SalGtkPicker::setGtkLanguage vcl/unx/gtk/fpicker/SalGtkPicker.cxx
Using LANGUAGE should get gettext to do the right thing without busting
any of the normal locale settings for us.
First thing to try would be to move that code out of there and get it
called before any gtk widgetery gets going. Try moving it into
GtkData::Init before that gtk_set_locale call and see it that
works/helps/does anything.
So I got fed up and tried this. Setting LANGUAGE in GtkData::Init()
indeed fixes the issue, but calling Application::GetSettings() there
throws a DeploymentException, apparently that code is executed too
early, before InitVCL() is called.
Regards,
Khaled
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 5ff5a80..87b3efd 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -603,6 +603,13 @@ void GtkData::Init()
SAL_INFO( vcl.gtk, GtkMainloop::Init() );
XrmInitialize();
+OUString aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(.UTF-8));
+if (!aLocaleString.isEmpty())
+{
+OUString envVar(LANGUAGE);
+osl_setEnvironment(envVar.pData, aLocaleString.pData);
+}
+
#if !GTK_CHECK_VERSION(3,0,0)
gtk_set_locale();
#endif
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appdde.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 04f4d4bfb708ef477618fa47d5f17779f4e4cf3c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 09:25:32 2013 +0200
Add TODO comment expressing doubts about existing code
Change-Id: I5fd8aa43da4ea879ec2adf31bb904a157b3425b0
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 5f2ab9c..563d378 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -256,6 +256,13 @@ sal_Bool SfxAppEvent_Impl( const OUString rCmd, const
OUString rEvent,
if ( rCmd.getLength() - start = 2 )
{
// Transform into the ApplicationEvent Format
+//TODO: I /assume/ that rCmd should match the syntax of
+// http://msdn.microsoft.com/en-us/library/ms648995.aspx
+// WM_DDE_EXECUTE message but does not (handle commands enclosed
+// in [...]; handle commas separating multiple arguments; handle
+// double , ((, )), [[, ]] in quoted arguments); see also the
mail
+// thread starting at http://lists.freedesktop.org/archives/
+// libreoffice/2013-July/054779.html DDE on Windows.
std::vectorOUString aData;
for ( sal_Int32 n = start; n rCmd.getLength() - 1; )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/fmcomp/gridctrl.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit feb6e7097fe0eb58590c18a9a1371f67f74f121f Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 30 09:23:52 2013 +0200 fdo#55955 select first column if possible Change-Id: I131cb0395c481d9cc1de210abc207221dab14bf4 diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f713df6..20b707b 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1604,6 +1604,12 @@ void DbGridControl::setDataSource(const Reference XRowSet _xCursor, sal_uInt if (nCurPos == BROWSER_INVALIDID || nCurPos = ColCount()) nCurPos = 0; +// Column zero is a valid choice and guaranteed to exist, +// but invisible to the user; if we have at least one +// user-visible column, go to that one. +if (nCurPos == 0 ColCount() 1) +nCurPos = 1; + // there are rows so go to the selected current column if (nRecordCount) GoToRowColumnId(0, GetColumnId(nCurPos)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dbaccess/source include/sal
dbaccess/source/ui/dlg/generalpage.cxx |7 ++-
include/sal/log-areas.dox |1 +
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 9b1d8d864b813ebf943b85b129335d7d55e35c41
Author: Javier Fernandez jfernan...@igalia.com
Date: Thu Jun 6 09:14:49 2013 +
fdo#67361 Prevent out-of-range values coming from ListBox GetSelectEntryPos.
Applied to master (LibreOffice 4.2.0.alpha) as:
Change-Id: Ia787c412408ef53db3c8458f54c7843c669c81ad
Reviewed-on: https://gerrit.libreoffice.org/4174
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
(without the fdo#67361 reference)
Squash with subsequent fixups:
1) -Werror=sign-compare
(ListBox::GetSelectEntryPos returns sal_uInt16)
Change-Id: Ia6e4bf4354523f5112ee3ade1d3da6db0f9ab2c4
2) Fix previous fix
Change-Id: I2d7ea38b743d78327fd19886019c1106bc1316d6
Also fix discrepancy between log-areas.dox and SAL_WARN argument.
Change-Id: I03fc1014da0be8335689954725ac605e32fbbee8
Reviewed-on: https://gerrit.libreoffice.org/5176
Reviewed-by: Tomáš Chvátal tchva...@suse.cz
Tested-by: Tomáš Chvátal tchva...@suse.cz
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 3eea60a..6a79acf 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -328,7 +328,12 @@ namespace dbaui
IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox*, _pBox )
{
// get the type from the entry data
-sal_Int16 nSelected = _pBox-GetSelectEntryPos();
+sal_uInt16 nSelected = _pBox-GetSelectEntryPos();
+if (nSelected = m_aURLPrefixes.size() )
+{
+SAL_WARN(dbaccess.ui.OGeneralPage, Got out-of-range value '
nSelected ' from the DatasourceType selection ListBox's
GetSelectEntryPos(): no corresponding URL prefix);
+return 0L;
+}
const OUString sURLPrefix = m_aURLPrefixes[ nSelected ];
setParentTitle( sURLPrefix );
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index bee62d6..e04e877 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -332,6 +332,7 @@ certain functionality.
@li @c dbaccess
@li @c dbaccess.ui
+@li @c dbaccess.ui.OGeneralPage
@section svx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - lo.xcent.in sal/osl
lo.xcent.in |4
sal/osl/unx/system.c | 14 ++
2 files changed, 18 insertions(+)
New commits:
commit c7e95dec6f9a4d1decfb1defb3cfa202df9003dd
Author: Tor Lillqvist t...@iki.fi
Date: Tue Jul 30 10:58:27 2013 +0300
Allow access to document scope bookmarks
Change-Id: If01cc2ae9f9018f08caa6a5c40025cfdabb0e20b
diff --git a/lo.xcent.in b/lo.xcent.in
index 8e9451c..946003b 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -6,6 +6,10 @@
string@MACOSX_BUNDLE_IDENTIFIER@/string
keycom.apple.security.app-sandbox/key
true/
+ keycom.apple.security.files.bookmarks.document-scope/key
+ true/
+ keycom.apple.security.files.bookmarks.collection-scope/key
+ true/
keycom.apple.security.files.user-selected.read-write/key
true/
keycom.apple.security.network.client/key
commit 7f4d2380dd16523d1583b9b005009cb90ffa2ea5
Author: Tor Lillqvist t...@iki.fi
Date: Tue Jul 30 10:57:50 2013 +0300
Be a bit more lax when resolving bookmarks when sandboxed
Change-Id: I6ada3e660ee58f7937425eea40a4bbd82754f4b1
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index a857769..20621a6 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include system.h
#ifdef NO_PTHREAD_RTL
@@ -140,7 +142,19 @@ struct hostent *gethostbyname_r(const char *name, struct
hostent *result,
*/
int macxp_resolveAlias(char *path, int buflen)
{
+#if HAVE_FEATURE_MACOSX_SANDBOX
+ /* Avoid unnecessary messages in the system.log:
+ *
+ * kernel[0]: Sandbox: soffice(57342) deny file-read-data /Users
+ * kernel[0]: Sandbox: soffice(57342) deny file-read-data /Users/tml
+ *
+ * etc. It is quite unlikely anyway, I hope, that anything except
+ * the last component of a path name would be a bookmark.
+ */
+ char *unprocessedPath = path + strlen(path) - 1;
+#else
char *unprocessedPath = path;
+#endif
if ( *unprocessedPath == '/' )
unprocessedPath++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/cuires.hrc|1
cui/source/inc/cuitabarea.hxx| 11 +-
cui/source/tabpages/tabarea.cxx | 87
cui/source/tabpages/tabarea.hrc | 69 -
cui/source/tabpages/tabarea.src | 90 -
cui/source/tabpages/tparea.cxx |1
cui/source/tabpages/tpbitmap.cxx |1
cui/source/tabpages/tpcolor.cxx |1
cui/source/tabpages/tpgradnt.cxx |1
cui/source/tabpages/tphatch.cxx |1
cui/source/tabpages/tpshadow.cxx |1
cui/uiconfig/ui/areadialog.ui| 200 +++
14 files changed, 255 insertions(+), 211 deletions(-)
New commits:
commit 4e0c83d43c2effbeda70313531363dc70a6febf7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Mon Jul 29 09:05:44 2013 -0300
Convert area dialog to widget UI
Conflicts:
cui/UIConfig_cui.mk
Change-Id: I6464d6af19aa84dee88e7e46cfa46f2ac1ab3660
Reviewed-on: https://gerrit.libreoffice.org/5165
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 9a49234..3d1d8de 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
cui/source/tabpages/swpossizetabpage.src \
-cui/source/tabpages/tabarea.src \
cui/source/tabpages/tabline.src \
cui/source/tabpages/textanim.src \
cui/source/tabpages/textattr.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index da49182..9ed5ec2 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acorreplacepage \
cui/uiconfig/ui/applyautofmtpage \
+ cui/uiconfig/ui/areadialog \
cui/uiconfig/ui/areatabpage \
cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index f0c9c4d..2ac707c 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -49,7 +49,6 @@
#define RID_SVXDLG_LINE (RID_SVX_START + 50)
#define RID_SVXDLG_BBDLG(RID_SVX_START + 40)
#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
-#define RID_SVXDLG_AREA (RID_SVX_START + 55)
#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
#define RID_SVXSTRARY_PAPERSIZE_DRAW(RID_SVX_START + 143)
#define RID_SVXSTR_TABLE_PRESET_NONE(RID_SVX_START + 969)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 44a05d9..313c6b7 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -36,6 +36,14 @@ class SdrView;
class SvxAreaTabDialog : public SfxTabDialog
{
+sal_uInt16m_nAreaTabPage;
+sal_uInt16m_nShadowTabPage;
+sal_uInt16m_nTransparenceTabPage;
+sal_uInt16m_nColorTabPage;
+sal_uInt16m_nGradientTabPage;
+sal_uInt16m_nHatchTabPage;
+sal_uInt16m_nBitmapTabPage;
+
private:
SdrModel* mpDrawModel;
@@ -69,7 +77,8 @@ protected:
public:
SvxAreaTabDialog( Window* pParent,
- const SfxItemSet* pAttr, SdrModel* pModel,
+ const SfxItemSet* pAttr,
+ SdrModel* pModel,
const SdrView* pSdrView = NULL );
~SvxAreaTabDialog();
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index a5b6772..007257b 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -32,7 +32,6 @@
#include svx/svdmodel.hxx
#include svx/drawitem.hxx
#include cuitabarea.hxx
-#include tabarea.hrc
#include dlgname.hxx
#include dialmgr.hxx
@@ -42,13 +41,22 @@ SvxAreaTabDialog::SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrView* /* pSdrView */
-) :
-
-SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ),
-
-mpDrawModel ( pModel ),
-mpColorList ( pModel-GetColorList() ),
-mpNewColorList( pModel-GetColorList() ),
+)
+: SfxTabDialog( pParent,
+ AreaDialog,
+ cui/ui/areadialog.ui,
+ pAttr )
+, m_nAreaTabPage(0)
+, m_nShadowTabPage(0)
+, m_nTransparenceTabPage(0)
+, m_nColorTabPage(0)
+, m_nGradientTabPage(0)
+, m_nHatchTabPage(0)
+, m_nBitmapTabPage(0)
+
+, mpDrawModel ( pModel ),
+mpColorList ( pModel-GetColorList() ),
+mpNewColorList ( pModel-GetColorList() ),
mpGradientList
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit c486d46980cae515ee7b9d0e8c7d5b12a295b503 Author: David Tardon dtar...@redhat.com Date: Tue Jul 30 06:45:48 2013 +0200 sanitize system clucene includes Apparently clucene bundles pieces of a very old version of boost (1.42) in CLucene/ext/boost, which breaks build with boost 1.54. (cherry picked from commit 24add548ac163651de5e3372798f0d4db347de77) Signed-off-by: David Tardon dtar...@redhat.com Conflicts: configure.ac Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def Reviewed-on: https://gerrit.libreoffice.org/5177 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index 03d2ef8..ce04c65 100644 --- a/configure.ac +++ b/configure.ac @@ -7144,6 +7144,7 @@ if test $with_system_clucene = yes; then AC_MSG_RESULT([external]) SYSTEM_CLUCENE=YES PKG_CHECK_MODULES(CLUCENE, libclucene-core) +CLUCENE_CFLAGS=[$(printf '%s' $CLUCENE_CFLAGS | sed -e 's@-I[^ ]*/CLucene/ext@@')] AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/windows/property.pm |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jul 30 10:26:32 2013 +0200
Advertized shortcuts somehow don't work well with Windows 7 shell
Change-Id: Ifc216cef7091bffe5971bed0b0e0ef65a26e87e0
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index c5e7751..2244c8b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -269,6 +269,9 @@ sub set_important_properties
$onepropertyline = DONTOPTIMIZELIBS . \t . 0 . \n;
push(@{$propertyfile}, $onepropertyline);
+$onepropertyline = DISABLEADVTSHORTCUTS . \t . 1 . \n;
+push(@{$propertyfile}, $onepropertyline);
+
if ( $installer::globals::officedirhostname )
{
my $onepropertyline = OFFICEDIRHOSTNAME . \t .
$installer::globals::officedirhostname . \n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/glosdoc.cxx | 126 --
1 file changed, 60 insertions(+), 66 deletions(-)
New commits:
commit c3967de41502f973104b8d42c53f9faf932e2bd7
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Jul 21 16:06:38 2013 +0200
Bail out early
Change-Id: I4b80a029d5342b180a9f53777f714527b4d3f982
Reviewed-on: https://gerrit.libreoffice.org/5180
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 11c8dc8..63dc8a6 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -65,28 +65,23 @@ static String lcl_CheckFileName( const OUString
rNewFilePath,
}
sRet = comphelper::string::strip(sRet, ' ');
-bool bOk = false;
if( sRet.Len() )
{
String sTmpDir(rNewFilePath);
sTmpDir += INET_PATH_TOKEN;
sTmpDir += sRet;
sTmpDir += SwGlossaries::GetExtension();
-bOk = !FStatHelper::IsDocument( sTmpDir );
+if (!FStatHelper::IsDocument( sTmpDir ))
+return sRet;
}
-if( !bOk )
-{
-OUString rSG = SwGlossaries::GetExtension();
-//generate generic name
-utl::TempFile aTemp(OUString(group),
-rSG, rNewFilePath );
-aTemp.EnableKillingFile();
-
-INetURLObject aTempURL( aTemp.GetURL() );
-sRet = aTempURL.GetBase();
-}
-return sRet;
+OUString rSG = SwGlossaries::GetExtension();
+//generate generic name
+utl::TempFile aTemp(OUString(group), rSG, rNewFilePath );
+aTemp.EnableKillingFile();
+
+INetURLObject aTempURL( aTemp.GetURL() );
+return aTempURL.GetBase();
}
/*
@@ -223,63 +218,62 @@ sal_Bool SwGlossaries::NewGroupDoc(String rGroupName,
const String rTitle)
sal_BoolSwGlossaries::RenameGroupDoc(
const String rOldGroup, String rNewGroup, const String rNewTitle )
{
-sal_Bool bRet = sal_False;
sal_uInt16 nOldPath = (sal_uInt16)rOldGroup.GetToken(1,
GLOS_DELIM).ToInt32();
-if (static_castsize_t(nOldPath) m_PathArr.size())
+if (static_castsize_t(nOldPath) = m_PathArr.size())
+return sal_False;
+
+String sOldFileURL(m_PathArr[nOldPath]);
+sOldFileURL += INET_PATH_TOKEN;
+sOldFileURL += rOldGroup.GetToken(0, GLOS_DELIM);
+sOldFileURL += SwGlossaries::GetExtension();
+if (!FStatHelper::IsDocument( sOldFileURL ))
{
-String sOldFileURL(m_PathArr[nOldPath]);
-sOldFileURL += INET_PATH_TOKEN;
-sOldFileURL += rOldGroup.GetToken(0, GLOS_DELIM);
-sOldFileURL += SwGlossaries::GetExtension();
-sal_Bool bExist = FStatHelper::IsDocument( sOldFileURL );
-OSL_ENSURE(bExist, group doesn't exist!);
-if(bExist)
-{
-sal_uInt16 nNewPath = (sal_uInt16)rNewGroup.GetToken(1,
GLOS_DELIM).ToInt32();
-if (static_castsize_t(nNewPath) m_PathArr.size())
-{
-String sNewFilePath(m_PathArr[nNewPath]);
-String sNewFileName = lcl_CheckFileName(
-sNewFilePath, rNewGroup.GetToken(0,
GLOS_DELIM));
-const sal_uInt16 nFileNameLen = sNewFileName.Len();
-sNewFileName += SwGlossaries::GetExtension();
-String sTempNewFilePath(sNewFilePath);
-sTempNewFilePath += INET_PATH_TOKEN;
-sTempNewFilePath += sNewFileName ;
-bExist = FStatHelper::IsDocument( sTempNewFilePath );
-OSL_ENSURE(!bExist, group already exists!);
-if(!bExist)
-{
-sal_Bool bCopyCompleted = SWUnoHelper::UCB_CopyFile(
-sOldFileURL, sTempNewFilePath,
sal_True );
-if(bCopyCompleted)
-{
-bRet = sal_True;
-RemoveFileFromList( rOldGroup );
+OSL_FAIL(group doesn't exist!);
+return sal_False;
+}
-rNewGroup = sNewFileName.Copy(0, nFileNameLen);
-rNewGroup += GLOS_DELIM;
-rNewGroup += OUString::number(nNewPath);
-if (m_GlosArr.empty())
-{
-GetNameList();
-}
-else
-{
-m_GlosArr.push_back(rNewGroup);
-}
+sal_uInt16 nNewPath = (sal_uInt16)rNewGroup.GetToken(1,
GLOS_DELIM).ToInt32();
+if (static_castsize_t(nNewPath) = m_PathArr.size())
+return sal_False;
-sNewFilePath += INET_PATH_TOKEN;
-sNewFilePath += sNewFileName ;
-SwTextBlocks* pNewBlock =
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 54264, which changed state. Bug 54264 Summary: FILEOPEN: LO cannot open more than one file at a time from Mac Finder https://bugs.freedesktop.org/show_bug.cgi?id=54264 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67361, which changed state. Bug 67361 Summary: --without-java build segfault in database wizard https://bugs.freedesktop.org/show_bug.cgi?id=67361 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/glosdoc.cxx | 50 --
1 file changed, 24 insertions(+), 26 deletions(-)
New commits:
commit 636f90327f4452eca9bf16c84b6cff0239c222a0
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Jul 21 19:04:12 2013 +0200
String to OUString
Change-Id: Ie7c04d75bcdf5b9a2b3c941b7cd8fac20a37999c
Reviewed-on: https://gerrit.libreoffice.org/5181
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 63dc8a6..c7da15c 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -49,28 +49,27 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
// PUBLIC METHODES ---
-static String lcl_CheckFileName( const OUString rNewFilePath,
- const String rNewGroupName )
+static OUString lcl_CheckFileName( const OUString rNewFilePath,
+ const OUString rNewGroupName )
{
-String sRet;
+const sal_Int32 nLen = rNewGroupName.getLength();
+OUStringBuffer aBuf(nLen);
//group name should contain only A-Z and a-z and spaces
-for( xub_StrLen i = 0; i rNewGroupName.Len(); i++ )
+for( sal_Int32 i=0; i nLen; ++i )
{
-sal_Unicode cChar = rNewGroupName.GetChar(i);
+const sal_Unicode cChar = rNewGroupName[i];
if (comphelper::string::isalnumAscii(cChar) ||
cChar == '_' || cChar == 0x20)
{
-sRet += cChar;
+aBuf.append(cChar);
}
}
-sRet = comphelper::string::strip(sRet, ' ');
-if( sRet.Len() )
+const OUString sRet = aBuf.makeStringAndClear().trim();
+if ( !sRet.isEmpty() )
{
-String sTmpDir(rNewFilePath);
-sTmpDir += INET_PATH_TOKEN;
-sTmpDir += sRet;
-sTmpDir += SwGlossaries::GetExtension();
+const OUString sTmpDir = rNewFilePath + OUString(INET_PATH_TOKEN)
++ sRet + SwGlossaries::GetExtension();
if (!FStatHelper::IsDocument( sTmpDir ))
return sRet;
}
@@ -199,7 +198,7 @@ sal_Bool SwGlossaries::NewGroupDoc(String rGroupName,
const String rTitle)
sal_uInt16 nNewPath = (sal_uInt16)rGroupName.GetToken(1,
GLOS_DELIM).ToInt32();
if (static_castsize_t(nNewPath) = m_PathArr.size())
return sal_False;
-String sNewFilePath(m_PathArr[nNewPath]);
+const OUString sNewFilePath(m_PathArr[nNewPath]);
String sNewGroup = lcl_CheckFileName(sNewFilePath, rGroupName.GetToken(0,
GLOS_DELIM));
sNewGroup += GLOS_DELIM;
sNewGroup += rGroupName.GetToken(1, GLOS_DELIM);
@@ -222,10 +221,10 @@ sal_BoolSwGlossaries::RenameGroupDoc(
if (static_castsize_t(nOldPath) = m_PathArr.size())
return sal_False;
-String sOldFileURL(m_PathArr[nOldPath]);
-sOldFileURL += INET_PATH_TOKEN;
-sOldFileURL += rOldGroup.GetToken(0, GLOS_DELIM);
-sOldFileURL += SwGlossaries::GetExtension();
+const OUString sOldFileURL = m_PathArr[nOldPath]
++ OUString(INET_PATH_TOKEN)
++ rOldGroup.GetToken(0, GLOS_DELIM)
++ SwGlossaries::GetExtension();
if (!FStatHelper::IsDocument( sOldFileURL ))
{
OSL_FAIL(group doesn't exist!);
@@ -236,14 +235,14 @@ sal_BoolSwGlossaries::RenameGroupDoc(
if (static_castsize_t(nNewPath) = m_PathArr.size())
return sal_False;
-String sNewFilePath(m_PathArr[nNewPath]);
-String sNewFileName = lcl_CheckFileName(
+OUString sNewFilePath(m_PathArr[nNewPath]);
+OUString sNewFileName = lcl_CheckFileName(
sNewFilePath, rNewGroup.GetToken(0, GLOS_DELIM));
-const sal_uInt16 nFileNameLen = sNewFileName.Len();
+const sal_Int32 nFileNameLen = sNewFileName.getLength();
sNewFileName += SwGlossaries::GetExtension();
-String sTempNewFilePath(sNewFilePath);
-sTempNewFilePath += INET_PATH_TOKEN;
-sTempNewFilePath += sNewFileName ;
+const OUString sTempNewFilePath = sNewFilePath
++ OUString(INET_PATH_TOKEN)
++ sNewFileName;
if (FStatHelper::IsDocument( sTempNewFilePath ))
{
OSL_FAIL(group already exists!);
@@ -255,7 +254,7 @@ sal_BoolSwGlossaries::RenameGroupDoc(
RemoveFileFromList( rOldGroup );
-rNewGroup = sNewFileName.Copy(0, nFileNameLen);
+rNewGroup = sNewFileName.copy(0, nFileNameLen);
rNewGroup += GLOS_DELIM;
rNewGroup += OUString::number(nNewPath);
if (m_GlosArr.empty())
@@ -267,8 +266,7 @@ sal_BoolSwGlossaries::RenameGroupDoc(
m_GlosArr.push_back(rNewGroup);
}
-sNewFilePath += INET_PATH_TOKEN;
-sNewFilePath += sNewFileName ;
+sNewFilePath += OUString(INET_PATH_TOKEN) + sNewFileName;
SwTextBlocks* pNewBlock = new SwTextBlocks( sNewFilePath );
pNewBlock-SetName(rNewTitle);
delete pNewBlock;
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/simplepackage.pm |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 79d1d1b4405b9f76de10b9c2c5ecdca686b1f7b9
Author: Tor Lillqvist t...@iki.fi
Date: Tue Jul 30 11:36:18 2013 +0300
Use sandboxing when requested also for the app bundle in the dmg
Change-Id: I612be680e7aea2b098894aa4e11b10b471d34144
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index bf769f4..3a745ec 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -424,7 +424,10 @@ sub create_package
# participate in the signing and their validity can be
# guaranteed.
-$systemcall = codesign --sign
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v
$localtempdir/$folder/$volume_name_classic_app.app;
+$entitlements = '';
+$entitlements = --entitlements $ENV{'BUILDDIR'}/lo.xcent if
defined($ENV{'ENABLE_MACOSX_SANDBOX'});
+
+$systemcall = codesign --sign
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force $entitlements -v -v -v
$localtempdir/$folder/$volume_name_classic_app.app;
print ... $systemcall ...\n;
my $returnvalue = system($systemcall);
$infoline = Systemcall: $systemcall\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/registry dbaccess/source
connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu | 8 ++-- dbaccess/source/core/misc/dsntypes.cxx | 1 + dbaccess/source/inc/dsntypes.hxx| 3 ++- 3 files changed, 5 insertions(+), 7 deletions(-) New commits: commit 739226133373960e42416da95216b7c736d572c6 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Tue Jul 30 11:06:22 2013 +0200 Fix firebird-sdbc registry details. Change-Id: I753095ba40b5fb45cfccd10a95bd8eb7b68bd564 diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu index 84ca47c..1141deb 100644 --- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu @@ -32,13 +32,13 @@ * -- oor:component-data oor:name=Drivers oor:package=org.openoffice.Office.DataAccess xmlns:install=http://openoffice.org/2004/installation; xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; - node oor:name=Installed install:module=firebird_sdbc + node oor:name=Installed install:module=firebird node oor:name=sdbc:embedded:firebird oor:op=replace prop oor:name=Driver valuecom.sun.star.comp.sdbc.firebird.Driver/value /prop prop oor:name=DriverTypeDisplayName oor:type=xs:string -value xml:lang=en-USFirebird/value +value xml:lang=en-USFirebird Embedded/value /prop node oor:name=Properties !-- Don't use ODBC syntax for datetime literals and (full) outer joins, @@ -126,7 +126,3 @@ /node /node /oor:component-data - -!-- Local Variables: -- -!-- indent-tabs-mode: nil -- -!-- End: -- diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 6eeec00..51113b3 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -410,6 +410,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString _rDsn) const KnownPrefix( sdbc:flat:, DST_FLAT, false ), KnownPrefix( sdbc:odbc:, DST_ODBC, false ), KnownPrefix( sdbc:dbase:, DST_DBASE, false ), +KnownPrefix( sdbc:firebird:, DST_FIREBIRD, false ), KnownPrefix( sdbc:mysql:odbc:,DST_MYSQL_ODBC, false ), KnownPrefix( sdbc:mysql:jdbc:,DST_MYSQL_JDBC, false ), KnownPrefix( sdbc:mysql:mysqlc:, DST_MYSQL_NATIVE, false ), diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index e7c42af..6802694 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -61,7 +61,8 @@ enum DATASOURCE_TYPE DST_EMBEDDED_HSQLDB= 23, DST_MYSQL_NATIVE= 24, DST_MYSQL_NATIVE_DIRECT = 25, -DST_EMBEDDED_FIREBIRD= 26, +DST_FIREBIRD= 26, +DST_EMBEDDED_FIREBIRD= 27, DST_USERDEFINE1,/// first user defined driver DST_USERDEFINE2, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xsltfilter/LibXSLTTransformer.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 36efa8c6a8ffcad1b285caa4cfda138a900becf7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 11:44:23 2013 +0200
Related rhbz#98977: Handle multiple LibXSLTTransformer::terminate calls
Trying to reproduce rhbz#98977, temporarily changing
TRANSFORMATION_TIMEOUT_SEC
(filter/source/xsltfilter/XSLTFilter.cxx) to zero, loading a dummy
Microsoft
Excel 2003 XML (.xml) file shows a General input/output error msg box and
Cancel leads to a crash due to duplicate calls to m_tcontrol-terminate()
from
both XSLTFilter::importer and XSLTFilter::endDocument (both
filter/source/xsltfilter/XSLTFilter.cxx).
Change-Id: Ia103d944f3e1f14ca2cf5552ca3a48348132d38e
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 65d3725..c0abb88 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -464,8 +464,11 @@ namespace XSLT
void
LibXSLTTransformer::terminate() throw (RuntimeException)
{
-m_Reader-terminate();
-m_Reader-join();
+if (m_Reader.is())
+{
+m_Reader-terminate();
+m_Reader-join();
+}
m_Reader.clear();
m_parameters.clear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/fmcomp/gridctrl.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit bac2e995debd58957bdca24ba29f4817a752e020 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 30 09:23:52 2013 +0200 fdo#55955 select first column if possible Change-Id: I131cb0395c481d9cc1de210abc207221dab14bf4 Reviewed-on: https://gerrit.libreoffice.org/5179 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 2663b8f..e77e54c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1605,6 +1605,12 @@ void DbGridControl::setDataSource(const Reference XRowSet _xCursor, sal_uInt if (nCurPos == BROWSER_INVALIDID || nCurPos = ColCount()) nCurPos = 0; +// Column zero is a valid choice and guaranteed to exist, +// but invisible to the user; if we have at least one +// user-visible column, go to that one. +if (nCurPos == 0 ColCount() 1) +nCurPos = 1; + // there are rows so go to the selected current column if (nRecordCount) GoToRowColumnId(0, GetColumnId(nCurPos)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/fmcomp/gridctrl.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 1e1d5847102cc23f33649118637e1723155e4b1a Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 30 09:23:52 2013 +0200 fdo#55955 select first column if possible Change-Id: I131cb0395c481d9cc1de210abc207221dab14bf4 Reviewed-on: https://gerrit.libreoffice.org/5178 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 83358a7..f3d875c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1604,6 +1604,12 @@ void DbGridControl::setDataSource(const Reference XRowSet _xCursor, sal_uInt if (nCurPos == BROWSER_INVALIDID || nCurPos = ColCount()) nCurPos = 0; +// Column zero is a valid choice and guaranteed to exist, +// but invisible to the user; if we have at least one +// user-visible column, go to that one. +if (nCurPos == 0 ColCount() 1) +nCurPos = 1; + // there are rows so go to the selected current column if (nRecordCount) GoToRowColumnId(0, GetColumnId(nCurPos)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/doc/doctxm.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 44ad2d98a5e9dbf7f6429caf920cdcf3931a62c4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri May 31 12:27:49 2013 +0200
Resolves: rhbz#989686 Fix crash with ooo120774-1.doc
Do not try to remove line breaks from empty string
Reviewed-on: https://gerrit.libreoffice.org/4114
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 2cb9aaf44dc589af79d62d7b1136b5d65e9f47d4)
Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b
Reviewed-on: https://gerrit.libreoffice.org/5195
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 2029d9f..6498585 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1536,6 +1536,8 @@ static String lcl_GetNumString( const SwTOXSortTabBase
rBase, bool bUsePrefix,
/// to a single space, and trailing space removed.
String lcl_RemoveLineBreaks( String sRet )
{
+if (!sRet.Len())
+return sRet;
xub_StrLen nOffset = 0;
sRet.SearchAndReplaceAll('\n', ' ');
for (xub_StrLen i = 1; i sRet.Len(); i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sal/osl
sal/osl/unx/salinit.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 3ec3ef25217bd6f47c80630387dca4b05e402b8d
Author: Tor Lillqvist t...@iki.fi
Date: Mon Jul 29 16:50:22 2013 +0300
Avoid crash on OS X: guarded fd exception
On OS X, a file descriptor that shows up as being of type KQUEUE in
lsof output is apparently created behind the scenes when starting a
thread. (Related to BSD kernel event queues: see man kqueue.) When we
re-exec ourselves on OS X, and then close all file descriptors = 3,
closing such a KQUEUE fd causes a crash.
Guard against this by closing only regular files.
(cherry picked from commit 73a508f574995f09559c003cb810e5d2ff2691c2)
Change-Id: I5011bfbaed156b04248b6bddb2a1a58624bee3d4
Reviewed-on: https://gerrit.libreoffice.org/5173
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 327ca0e..99cde2d 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -23,6 +23,7 @@
#include cassert
#include limits
#include unistd.h
+#include sys/stat.h
#endif
#include osl/process.h
@@ -61,7 +62,9 @@ void sal_detail_initialize(int argc, char ** argv) {
}
assert(openMax = 0 openMax = std::numeric_limits int ::max());
for (int fd = 3; fd openMax; ++fd) {
-close(fd);
+struct stat s;
+if (fstat(fd, s) != -1 S_ISREG(s.st_mode))
+close(fd);
}
#endif
#if HAVE_SYSLOG_H
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/drivers/mysql/YDriver.cxx | 36 ++
1 file changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 0c1d2fcdcfbfe83317e8660dd6165f3b438e80ad
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 09:01:01 2013 +0200
rhbz#989246: Honor user's JavaDriverClass override in mysql driver
Change-Id: Ic7dbddb5b17af0bd23864fd19ab2bd815969d008
(cherry picked from commit 63897351fc4fd31305bef43b649be74e2b6006c4)
Reviewed-on: https://gerrit.libreoffice.org/5193
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx
b/connectivity/source/drivers/mysql/YDriver.cxx
index bd826e0..b55f464 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -49,6 +49,15 @@ namespace connectivity
}
}
+namespace
+{
+OUString getJavaDriverClass(
+css::uno::Sequencecss::beans::PropertyValue const info)
+{
+return comphelper::NamedValueCollection(info).getOrDefault(
+JavaDriverClass, OUString(com.mysql.jdbc.Driver));
+}
+}
//
//= ODriverDelegator
@@ -156,9 +165,14 @@ namespace connectivity
const PropertyValue* pEnd = pSupported + info.getLength();
aProps.reserve(info.getLength() + 5);
+bool jdc = false;
for (;pSupported != pEnd; ++pSupported)
{
aProps.push_back( *pSupported );
+if (pSupported-Name == JavaDriverClass)
+{
+jdc = true;
+}
}
if ( _eType == D_ODBC )
@@ -176,11 +190,14 @@ namespace connectivity
}
else if ( _eType == D_JDBC )
{
-aProps.push_back( PropertyValue(
-OUString(JavaDriverClass)
-,0
-,makeAny(OUString(com.mysql.jdbc.Driver))
-,PropertyState_DIRECT_VALUE) );
+if (!jdc)
+{
+aProps.push_back( PropertyValue(
+ OUString(JavaDriverClass)
+ ,0
+
,makeAny(OUString(com.mysql.jdbc.Driver))
+ ,PropertyState_DIRECT_VALUE) );
+}
}
else
{
@@ -229,10 +246,7 @@ namespace connectivity
}
else
{
-::comphelper::NamedValueCollection aSettings( info );
-OUString sDriverClass(com.mysql.jdbc.Driver);
-sDriverClass = aSettings.getOrDefault( JavaDriverClass,
sDriverClass );
-
+OUString sDriverClass(getJavaDriverClass(info));
TJDBCDrivers::iterator aFind = m_aJdbcDrivers.find(sDriverClass);
if ( aFind == m_aJdbcDrivers.end() )
aFind =
m_aJdbcDrivers.insert(TJDBCDrivers::value_type(sDriverClass,lcl_loadDriver(m_xContext,sCuttedUrl))).first;
@@ -318,7 +332,7 @@ namespace connectivity
}
//
-Sequence DriverPropertyInfo SAL_CALL ODriverDelegator::getPropertyInfo(
const OUString url, const Sequence PropertyValue /*info*/ ) throw
(SQLException, RuntimeException)
+Sequence DriverPropertyInfo SAL_CALL ODriverDelegator::getPropertyInfo(
const OUString url, const Sequence PropertyValue info ) throw
(SQLException, RuntimeException)
{
::std::vector DriverPropertyInfo aDriverInfo;
if ( !acceptsURL(url) )
@@ -350,7 +364,7 @@ namespace connectivity
OUString(JavaDriverClass)
,OUString(The JDBC driver class name.)
,sal_True
-,OUString(com.mysql.jdbc.Driver)
+,getJavaDriverClass(info)
,Sequence OUString ())
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/drivers/mysql/YDriver.cxx | 36 ++
1 file changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 9957058b1cf9460df23d03d90e2276c33ea33cdc
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 09:01:01 2013 +0200
rhbz#989246: Honor user's JavaDriverClass override in mysql driver
(cherry picked from commit 63897351fc4fd31305bef43b649be74e2b6006c4)
Conflicts:
connectivity/source/drivers/mysql/YDriver.cxx
Change-Id: Ic7dbddb5b17af0bd23864fd19ab2bd815969d008
Reviewed-on: https://gerrit.libreoffice.org/5197
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx
b/connectivity/source/drivers/mysql/YDriver.cxx
index 941f47c..6ff63cb 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -47,6 +47,15 @@ namespace connectivity
}
}
+namespace
+{
+OUString getJavaDriverClass(
+css::uno::Sequencecss::beans::PropertyValue const info)
+{
+return comphelper::NamedValueCollection(info).getOrDefault(
+JavaDriverClass, OUString(com.mysql.jdbc.Driver));
+}
+}
//
//= ODriverDelegator
@@ -157,9 +166,14 @@ namespace connectivity
const PropertyValue* pEnd = pSupported + info.getLength();
aProps.reserve(info.getLength() + 5);
+bool jdc = false;
for (;pSupported != pEnd; ++pSupported)
{
aProps.push_back( *pSupported );
+if (pSupported-Name == JavaDriverClass)
+{
+jdc = true;
+}
}
if ( _eType == D_ODBC )
@@ -177,11 +191,14 @@ namespace connectivity
}
else if ( _eType == D_JDBC )
{
-aProps.push_back( PropertyValue(
-::rtl::OUString(JavaDriverClass)
-,0
-
,makeAny(::rtl::OUString(com.mysql.jdbc.Driver))
-,PropertyState_DIRECT_VALUE) );
+if (!jdc)
+{
+aProps.push_back( PropertyValue(
+ ::rtl::OUString(JavaDriverClass)
+ ,0
+
,makeAny(::rtl::OUString(com.mysql.jdbc.Driver))
+ ,PropertyState_DIRECT_VALUE) );
+}
}
else
{
@@ -230,10 +247,7 @@ namespace connectivity
}
else
{
-::comphelper::NamedValueCollection aSettings( info );
-::rtl::OUString sDriverClass(com.mysql.jdbc.Driver);
-sDriverClass = aSettings.getOrDefault( JavaDriverClass,
sDriverClass );
-
+OUString sDriverClass(getJavaDriverClass(info));
TJDBCDrivers::iterator aFind = m_aJdbcDrivers.find(sDriverClass);
if ( aFind == m_aJdbcDrivers.end() )
aFind =
m_aJdbcDrivers.insert(TJDBCDrivers::value_type(sDriverClass,lcl_loadDriver(m_xFactory,sCuttedUrl))).first;
@@ -319,7 +333,7 @@ namespace connectivity
}
//
-Sequence DriverPropertyInfo SAL_CALL ODriverDelegator::getPropertyInfo(
const ::rtl::OUString url, const Sequence PropertyValue /*info*/ ) throw
(SQLException, RuntimeException)
+Sequence DriverPropertyInfo SAL_CALL ODriverDelegator::getPropertyInfo(
const ::rtl::OUString url, const Sequence PropertyValue info ) throw
(SQLException, RuntimeException)
{
::std::vector DriverPropertyInfo aDriverInfo;
if ( !acceptsURL(url) )
@@ -351,7 +365,7 @@ namespace connectivity
::rtl::OUString(JavaDriverClass)
,::rtl::OUString(The JDBC driver class name.)
,sal_True
-,::rtl::OUString(com.mysql.jdbc.Driver)
+,getJavaDriverClass(info)
,Sequence ::rtl::OUString ())
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source include/sfx2 include/vcl sfx2/source vcl/aqua
desktop/source/app/app.cxx | 24 +++-
include/sfx2/app.hxx|1
include/vcl/svapp.hxx | 40
sfx2/source/appl/appdde.cxx | 78 ++--
vcl/aqua/source/app/salinst.cxx |3 -
vcl/aqua/source/app/vclnsapp.mm | 30 +++
6 files changed, 113 insertions(+), 63 deletions(-)
New commits:
commit d5266a9e3f367752e2b2099e542518078271edcc
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Jul 27 19:47:01 2013 +0200
fdo#54264: Fix multi-argument ApplicationEvent::TYPE_OPEN/PRINT
...that had been broken when 5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5
Cleaned
up CommandLineArgs changed the representation of those multi-arguments
from a
single string with \n delimiters to vectorstring in
desktop/soruce/app/cmdlineargs.hxx, but missed updating other producers of
such ApplicationEvents.
(cherry picked from commit 787940e0ac285aa1101ca8964d252faaab3ea8c1, plus
04f4d4bfb708ef477618fa47d5f17779f4e4cf3c Add TODO comment expressing doubts
about existing code)
Conflicts:
sfx2/source/appl/appdde.cxx
Change-Id: I527d620c60a87f3a01d970927c521163fb6df192
Reviewed-on: https://gerrit.libreoffice.org/5192
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 195776f..5bda373 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2645,7 +2645,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
case ApplicationEvent::TYPE_ACCEPT:
// every time an accept parameter is used we create an acceptor
// with the corresponding accept-string
-createAcceptor(rAppEvent.GetData());
+createAcceptor(rAppEvent.GetStringData());
break;
case ApplicationEvent::TYPE_APPEAR:
if ( !GetCommandLineArgs().IsInvisible() )
@@ -2694,7 +2694,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
}
break;
case ApplicationEvent::TYPE_HELP:
-displayCmdlineHelp(rAppEvent.GetData());
+displayCmdlineHelp(rAppEvent.GetStringData());
break;
case ApplicationEvent::TYPE_VERSION:
displayVersion();
@@ -2706,7 +2706,9 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
{
ProcessDocumentsRequest* pDocsRequest = new
ProcessDocumentsRequest(
rCmdLine.getCwdUrl());
-pDocsRequest-aOpenList.push_back(rAppEvent.GetData());
+std::vectorOUString const data(rAppEvent.GetStringsData());
+pDocsRequest-aOpenList.insert(
+pDocsRequest-aOpenList.end(), data.begin(), data.end());
pDocsRequest-pcProcessed = NULL;
OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest );
@@ -2716,7 +2718,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
break;
case ApplicationEvent::TYPE_OPENHELPURL:
// start help for a specific URL
-Application::GetHelp()-Start(rAppEvent.GetData(), NULL);
+Application::GetHelp()-Start(rAppEvent.GetStringData(), NULL);
break;
case ApplicationEvent::TYPE_PRINT:
{
@@ -2725,7 +2727,9 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
{
ProcessDocumentsRequest* pDocsRequest = new
ProcessDocumentsRequest(
rCmdLine.getCwdUrl());
-pDocsRequest-aPrintList.push_back(rAppEvent.GetData());
+std::vectorOUString const data(rAppEvent.GetStringsData());
+pDocsRequest-aPrintList.insert(
+pDocsRequest-aPrintList.end(), data.begin(), data.end());
pDocsRequest-pcProcessed = NULL;
OfficeIPCThread::ExecuteCmdLineRequests( *pDocsRequest );
@@ -2771,10 +2775,10 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
Reference css::util::XURLTransformer xParser =
css::util::URLTransformer::create(xContext);
css::util::URL aCommand;
-if( rAppEvent.GetData() == OUString(PREFERENCES) )
-aCommand.Complete = OUString( .uno:OptionsTreeDialog );
-else if( rAppEvent.GetData() == OUString(ABOUT) )
-aCommand.Complete = OUString( .uno:About );
+if( rAppEvent.GetStringData() == PREFERENCES )
+aCommand.Complete = .uno:OptionsTreeDialog;
+else if( rAppEvent.GetStringData() == ABOUT )
+aCommand.Complete = .uno:About;
if( !aCommand.Complete.isEmpty() )
{
xParser-parseStrict(aCommand);
@@ -2789,7 +2793,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent
rAppEvent )
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/control/button.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb37804bb6f4df0e7bc28e68bd7d1165cc848f93 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 11:22:39 2013 +0100 Related: fdo#66817 pressing space on a DisclosureButton should toggle it Change-Id: Ib0f03e4389a35f1eb66c3c5951e89a9f70ec7145 (cherry picked from commit 9f7eab01a65c39b07afb1fba8819593694a3fef3) Reviewed-on: https://gerrit.libreoffice.org/5168 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 4254113..d223320 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -4165,7 +4165,7 @@ void DisclosureButton::KeyInput( const KeyEvent rKEvt ) Check( aKeyCode.GetCode() == KEY_ADD ); } else -Button::KeyInput( rKEvt ); +CheckBox::KeyInput( rKEvt ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/backgroundpage.ui | 60 +++--- 1 file changed, 44 insertions(+), 16 deletions(-) New commits: commit 26c320c7d56171bf61e5ddeb028d19d1d79e59fc Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 16 14:20:29 2013 +0100 tweak background fill color preview to be half-full height Change-Id: I44a9fc676129dda206e525ee89809f84d77aff48 (cherry picked from commit 3e787929d86ba9c306d54363a06de121fbe5c7aa) Reviewed-on: https://gerrit.libreoffice.org/5167 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 68a550a..0bf2060 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -151,22 +151,6 @@ property name=vexpandTrue/property property name=row_spacing6/property child - object class=cuilo-BackgroundPreview id=preview1 -property name=width_request150/property -property name=height_request150/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hexpandTrue/property -property name=vexpandTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child object class=GtkGrid id=grid12 property name=visibleTrue/property property name=can_focusFalse/property @@ -208,6 +192,50 @@ property name=height1/property /packing /child +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=orientationvertical/property +property name=homogeneousTrue/property +child + object class=cuilo-BackgroundPreview id=preview1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + placeholder/ +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/qa sc/source
sc/qa/unit/data/ods/fdo62729.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 30 ++
sc/source/filter/xml/xmlexprt.cxx |1 +
3 files changed, 31 insertions(+)
New commits:
commit f5073172ace5722ad1bc9ee59d39e84077bf9846
Author: Noel Power noel.po...@suse.com
Date: Mon Jul 29 10:00:15 2013 +0100
fix for fdo#62729 reference pos can point to non existing table
there is an existing function ( called at least from uno names api also )
that updates the tab pos, calling that seems to fix this problem
(cherry picked from commit b5fffdb8d0438a2fe933a5742d41fe50a14b71f3)
with squash of
unit test for fdo#62729 ( with tweak for 4.0 )
(cherry picked from commit 7b3d8e0a7dcf6ae05e1de5c33ed382822cf52cce)
b9be75459aa49b8bab968dedae9e0760ccef9a26
Reviewed-on: https://gerrit.libreoffice.org/5124
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit cb626d01772985bd0eed0f5963475d0e801379c8)
Conflicts:
sc/source/filter/xml/xmlexprt.cxx
Change-Id: I6f6f31895eda9c338eeabd3f3285bf2c9eb23b7e
Reviewed-on: https://gerrit.libreoffice.org/5164
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/qa/unit/data/ods/fdo62729.ods b/sc/qa/unit/data/ods/fdo62729.ods
new file mode 100644
index 000..00b5079
Binary files /dev/null and b/sc/qa/unit/data/ods/fdo62729.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 844020d..fe7e963 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -78,6 +78,7 @@ public:
void testPasswordExport();
void testConditionalFormatExportXLSX();
void testMiscRowHeightExport();
+void testNamedRangeBugfdo62729();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -86,6 +87,7 @@ public:
#endif
CPPUNIT_TEST(testConditionalFormatExportXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
+CPPUNIT_TEST(testNamedRangeBugfdo62729);
CPPUNIT_TEST_SUITE_END();
private:
@@ -371,6 +373,34 @@ void ScExportTest::testMiscRowHeightExport()
}
}
+
+void ScExportTest::testNamedRangeBugfdo62729()
+{
+ScDocShellRef xShell = loadDocument(fdo62729., ODS);
+CPPUNIT_ASSERT(xShell.Is());
+ScDocument* pDoc = xShell-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+ScRangeName* pNames = pDoc-GetRangeName();
+//should be just a single named range
+CPPUNIT_ASSERT(pNames-size() == 1 );
+pDoc-DeleteTab(0);
+//should be still a single named range
+CPPUNIT_ASSERT(pNames-size() == 1 );
+ScDocShellRef xDocSh = saveAndReload(xShell, ODS);
+xShell-DoClose();
+
+CPPUNIT_ASSERT(xDocSh.Is());
+pDoc = xDocSh-GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+pNames = pDoc-GetRangeName();
+//after reload should still have a named range
+CPPUNIT_ASSERT(pNames-size() == 1 );
+
+xDocSh-DoClose();
+}
+
ScExportTest::ScExportTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sc/qa/unit/data))
{
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 3882e2f..b5159f3 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3733,6 +3733,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName)
AddAttribute(sAttrName, it-second-GetName());
rtl::OUString sBaseCellAddress;
+it-second-ValidateTabRefs();
ScRangeStringConverter::GetStringFromAddress( sBaseCellAddress,
it-second-GetPos(), pDoc,
FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D);
AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,
sBaseCellAddress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Embedded DB Selector (was: Re: Firebird .odb for testing)
Hi everyone, I've now implemented an embedded db selector -- the patch is in gerrit ( https://gerrit.libreoffice.org/#/c/5199/ ), screenshot attached (excuse the ugliness -- there are some strange interactions between LO dialogs and my KDE going on which hide about half the dialog content, meaning I have to use the generic vcl plugin for now). It currently defaults to whichever database is set as default in dsntypes.cxx (for the moment still HSQLDB but I guess we'll change that to firebird once it's stable). Would it make sense to eventually store whichever db was last used to use as the default for the next time? I think it would also be useful to add more information on the choice of db to the dialog (i.e. use HSQLDB if you need to be compatible with older versions of LO, otherwise use Firebird etc.) W.r.t. to the naming in the list box: this is set within the Drivers.xcu of each relevant driver, and can be changed there as needed -- I'll probably change it to be HSQLDB Embedded + Firebird Embedded. Cheers, Andrzej On Mon, 2013-07-29 at 17:11 +0200, Andrzej Hunt wrote: Hi Michael, Fridrich, all, Attached is an empty .odb file which can be used to test the firebird-sdbc driver. (It doesn't contain an actual .fdb file within it -- this is created from scratch when needed and is then saved into the .odb when saving.) Please note the following: -The save button doesn't activate when appropriate yet -- you'll have to use save as explicitly to save the .odb. -You can't insert data into tables yet (unless you use a manual sql query, which I guess should probably work). -You may have issues when transporting a file between computers (once the .fdb has been created) as we don't deal with the icu issues yet. I'll probably start working on a selector to select between hsqldb and firebird for new files today/tomorrow. (I guess we'd want this anyway for a while in case people need to create new files that they can share with people using older versions of LO etc.). Cheers, Andrzej attachment: firebird03_dialog.png___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source officecfg/Configuration_officecfg.mk officecfg/files.mk officecfg/registry
basctl/source/basicide/codecompleteoptionsdlg.cxx| 32 +
basctl/source/basicide/codecompleteoptionsdlg.hxx|3
officecfg/Configuration_officecfg.mk |1
officecfg/files.mk |1
officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu | 38 ++
officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs | 61 +++
6 files changed, 136 insertions(+)
New commits:
commit 0fb3bff4e44f9df12214f008761218f4a1afdd44
Author: Gergo Mocsi gmocs...@gmail.com
Date: Tue Jul 30 13:01:43 2013 +0200
GSOC work, config entry to store options
Created a config file to store configuration for the feature.
NOTE: it gives a runtime error, so it is temporary disabled.
Change-Id: I7103bdfad43bb5760165430a57d93a90a7e5dc7e
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index e79190c..aa887a2 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -22,6 +22,8 @@
#include svtools/miscopt.hxx
#include basidesh.hrc
#include iostream
+#include officecfg/Office/BasicIDE.hxx
+#include boost/shared_ptr.hpp
namespace basctl
{
@@ -40,12 +42,14 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window*
pWindow )
pOkBtn-SetClickHdl( LINK( this, CodeCompleteOptionsDlg, OkHdl ) );
pCancelBtn-SetClickHdl( LINK( this, CodeCompleteOptionsDlg, CancelHdl ) );
+//LoadConfig();
pCodeCompleteChk-Check( CodeCompleteOptions::IsCodeCompleteOn() );
pAutocloseProcChk-Check( CodeCompleteOptions::IsProcedureAutoCompleteOn()
);
pAutocloseQuotesChk-Check( CodeCompleteOptions::IsAutoCloseQuotesOn() );
pAutocloseParenChk-Check( CodeCompleteOptions::IsAutoCloseParenthesisOn()
);
pAutoCorrectSpellingChk-Check(
CodeCompleteOptions::IsAutoCorrectSpellingOn() );
+
}
CodeCompleteOptionsDlg::~CodeCompleteOptionsDlg()
@@ -59,6 +63,8 @@ IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl)
CodeCompleteOptions::SetAutoCloseQuotesOn(
pAutocloseQuotesChk-IsChecked() );
CodeCompleteOptions::SetAutoCloseParenthesisOn(
pAutocloseParenChk-IsChecked() );
CodeCompleteOptions::SetAutoCorrectSpellingOn(
pAutoCorrectSpellingChk-IsChecked() );
+
+//SaveConfig();
Close();
return 0;
}
@@ -74,6 +80,32 @@ short CodeCompleteOptionsDlg::Execute()
return ModalDialog::Execute();
}
+void CodeCompleteOptionsDlg::LoadConfig()
+{
+bool bProcClose =
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get();
+bool bCodeCompleteOn =
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get();
+bool bParenClose =
officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get();
+bool bQuoteClose =
officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get();
+bool bCorrect =
officecfg::Office::BasicIDE::Autocomplete::AutoCorrectSpelling::get();
+
+pCodeCompleteChk-Check( bCodeCompleteOn );
+pAutocloseProcChk-Check( bProcClose );
+pAutocloseQuotesChk-Check( bQuoteClose );
+pAutocloseParenChk-Check( bParenClose );
+pAutoCorrectSpellingChk-Check( bCorrect );
+}
+
+void CodeCompleteOptionsDlg::SaveConfig()
+{
+boost::shared_ptr comphelper::ConfigurationChanges
batch(comphelper::ConfigurationChanges::create());
+officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set(
pAutocloseProcChk-IsChecked(), batch );
+officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set(
pCodeCompleteChk-IsChecked(), batch );
+officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set(
pAutocloseParenChk-IsChecked(), batch );
+officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set(
pAutocloseQuotesChk-IsChecked(), batch );
+officecfg::Office::BasicIDE::Autocomplete::AutoCorrectSpelling::set(
pAutoCorrectSpellingChk-IsChecked(), batch );
+batch-commit();
+}
+
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.hxx
b/basctl/source/basicide/codecompleteoptionsdlg.hxx
index 4c8b177..6314841 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.hxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.hxx
@@ -41,6 +41,9 @@ private:
DECL_LINK(OkHdl, void*);
DECL_LINK(CancelHdl, void*);
+void LoadConfig();
+void SaveConfig();
+
public:
CodeCompleteOptionsDlg( Window* pWindow );
~CodeCompleteOptionsDlg();
diff --git a/officecfg/Configuration_officecfg.mk
b/officecfg/Configuration_officecfg.mk
index 70cc15b..0f90f0a 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -32,6 +32,7 @@ $(eval $(call
gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/FirstStartWizard.xcu \
org/openoffice/Interaction.xcu \
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/bin
solenv/bin/modules/installer/windows/property.pm |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 124daa15861775c582164677377f9f7cbba54dc0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jul 30 10:26:32 2013 +0200
Advertized shortcuts somehow don't work well with Windows 7 shell
Change-Id: Ifc216cef7091bffe5971bed0b0e0ef65a26e87e0
(cherry picked from commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6)
Reviewed-on: https://gerrit.libreoffice.org/5196
Reviewed-by: Jesús Corrius jcorr...@gmail.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index c5e7751..2244c8b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -269,6 +269,9 @@ sub set_important_properties
$onepropertyline = DONTOPTIMIZELIBS . \t . 0 . \n;
push(@{$propertyfile}, $onepropertyline);
+$onepropertyline = DISABLEADVTSHORTCUTS . \t . 1 . \n;
+push(@{$propertyfile}, $onepropertyline);
+
if ( $installer::globals::officedirhostname )
{
my $onepropertyline = OFFICEDIRHOSTNAME . \t .
$installer::globals::officedirhostname . \n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/source
include/vcl/builder.hxx |3 +++
include/vcl/layout.hxx|8
include/vcl/msgbox.hxx| 24
vcl/source/window/builder.cxx | 22 +-
vcl/source/window/layout.cxx | 10 --
vcl/source/window/msgbox.cxx | 19 +++
6 files changed, 51 insertions(+), 35 deletions(-)
New commits:
commit 5718ffbf0e3e68e43f87541ce0368a15de8ec90e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 30 12:12:36 2013 +0100
Resolves: fdo#67378 merge the label into the disclosure button
Change-Id: I43df94c16a178c90da9c006565390a81c2fda29b
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index bdf0c82..71f24a7 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -31,6 +31,7 @@ class PopupMenu;
class ScrollBar;
class DateField;
class TimeField;
+class VclExpander;
class VclMultiLineEdit;
class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
@@ -209,6 +210,8 @@ private:
AtkMap m_aAtkInfo;
std::vectorMnemonicWidgetMap m_aMnemonicWidgetMaps;
+
+std::vectorVclExpander* m_aExpanderWidgets;
};
void loadTranslations(const LanguageTag rLanguageTag, const OUString
rUri);
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index bdcbedf..9c46acd 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -525,6 +525,14 @@ public:
{
m_aDisclosureButton.Check(bExpanded);
}
+void set_label(const OUString rLabel)
+{
+m_aDisclosureButton.SetText(rLabel);
+}
+OUString get_label() const
+{
+return m_aDisclosureButton.GetText();
+}
virtual void StateChanged(StateChangedType nType);
void SetExpandedHdl( const Link rLink ) { maExpandedHdl = rLink; }
const Link GetExpandedHdl() const { return maExpandedHdl; }
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index da45c56..2dbd0af 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -411,6 +411,22 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir,
OUString sUIFile, OStri
delete_by_window(aI-first);
}
+//fdo#67378 merge the label into the disclosure button
+for (std::vectorVclExpander*::iterator aI =
m_pParserState-m_aExpanderWidgets.begin(),
+aEnd = m_pParserState-m_aExpanderWidgets.end(); aI != aEnd; ++aI)
+{
+VclExpander *pOne = *aI;
+
+Window *pChild = pOne-get_child();
+Window* pLabel = pOne-GetWindow(WINDOW_LASTCHILD);
+if (pLabel pLabel != pChild pLabel-GetType() ==
WINDOW_FIXEDTEXT)
+{
+FixedText *pLabelWidget = static_castFixedText*(pLabel);
+pOne-set_label(pLabelWidget-GetText());
+delete_by_window(pLabel);
+}
+}
+
//drop maps, etc. that we don't need again
delete m_pParserState;
@@ -1116,7 +1132,11 @@ Window *VclBuilder::makeObject(Window *pParent, const
OString name, const OStri
else if (name == GtkFrame)
pWindow = new VclFrame(pParent);
else if (name == GtkExpander)
-pWindow = new VclExpander(pParent);
+{
+VclExpander *pExpander = new VclExpander(pParent);
+m_pParserState-m_aExpanderWidgets.push_back(pExpander);
+pWindow = pExpander;
+}
else if (name == GtkAlignment)
pWindow = new VclAlignment(pParent);
else if (name == GtkButton)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d458a8a..513dab4 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1504,17 +1504,7 @@ void VclExpander::StateChanged(StateChangedType nType)
if (nType == STATE_CHANGE_INITSHOW)
{
-//The label widget is the last (of two) children
Window *pChild = get_child();
-WindowImpl* pWindowImpl = ImplGetWindowImpl();
-Window *pLabel = pChild != pWindowImpl-mpLastChild ?
pWindowImpl-mpLastChild : NULL;
-if (pLabel pLabel-GetType() == WINDOW_FIXEDTEXT)
-{
-FixedText *pLabelWidget = static_castFixedText*(pLabel);
-if (!pLabelWidget-get_mnemonic_widget())
-pLabelWidget-set_mnemonic_widget(m_aDisclosureButton);
-}
-
if (pChild)
pChild-Show(m_aDisclosureButton.IsChecked());
}
commit 83195e2821f24c182098740fb506db215185917f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 30 09:42:12 2013 +0100
XubString-OUString for msgbox
Change-Id: Ieee6547b36534d0a31b6df8e00c44f1ebbaeae9a
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 93689f8..099bc55 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -38,12 +38,12 @@ class VCL_DLLPUBLIC MessBox : public ButtonDialog
protected:
VclMultiLineEdit* mpVCLMultiLineEdit;
FixedImage* mpFixedImage;
-XubString maMessText;
+OUString
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/findreplacedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit c2ce9bf0c2bfd2b38262de8571257c8f02b076b4 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 12:18:25 2013 +0100 Related: fdo#67378 rows missing HIG 6pixel spacing Change-Id: I6d4767c3159c1e9ebef19978a94ad994aab6ff4b diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui index f654796..225a952 100644 --- a/svx/uiconfig/ui/findreplacedialog.ui +++ b/svx/uiconfig/ui/findreplacedialog.ui @@ -496,6 +496,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property +property name=row_spacing6/property child object class=GtkCheckButton id=matchcase property name=label translatable=yesMa_tch case/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/window/salframeview.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 176fc56e89ca8cad0d390789e7376750765b1b0f
Author: Tor Lillqvist t...@iki.fi
Date: Tue Jul 30 14:22:51 2013 +0300
WaE: cast to 'id' from smaller integer type 'int'
Change-Id: I0106bac830416ef9743787b309ca2821dd6adc89
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index 4680965..86271dd 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -166,7 +166,7 @@ static AquaSalFrame* getMouseContainerFrame()
if( bAllowFullScreen [pNSWindow respondsToSelector:
setCollectionBehavior])
{
const int bMode= (bAllowFullScreen ?
NSWindowCollectionBehaviorFullScreenPrimary :
NSWindowCollectionBehaviorFullScreenAuxiliary);
-[pNSWindow performSelector:setCollectionBehavior withObject:(id)bMode];
+[pNSWindow performSelector:setCollectionBehavior
withObject:(id)(intptr_t)bMode];
}
// disable OSX=10.7 window restoration until we support it directly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 35785, which changed state. Bug 35785 Summary: LibreOffice's support of the recent documents feature of the Windows 7 Start menu broken https://bugs.freedesktop.org/show_bug.cgi?id=35785 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo64350.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 80 +--
sw/source/filter/ww8/docxattributeoutput.hxx | 17 +++--
4 files changed, 83 insertions(+), 23 deletions(-)
New commits:
commit 86166dea7e300d8aee42f141db1c533648254e6c
Author: Adam Co rattles2...@gmail.com
Date: Sun Jul 28 14:58:10 2013 +0300
fdo#64350: fix for page border shadow export
Change-Id: I3ae7a532eea7e81b9a302a98c00a514d307e8605
Reviewed-on: https://gerrit.libreoffice.org/5146
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/qa/extras/ooxmlexport/data/fdo64350.docx
b/sw/qa/extras/ooxmlexport/data/fdo64350.docx
new file mode 100644
index 000..6f41b66
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo64350.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 97015da..b0f9845 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -104,6 +104,7 @@ public:
void testFdo66781();
void testFdo60990();
void testFdo65718();
+void testFdo64350();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -184,6 +185,7 @@ void Test::run()
{fdo66781.docx, Test::testFdo66781},
{fdo60990.odt, Test::testFdo60990},
{fdo65718.docx, Test::testFdo65718},
+{fdo64350.docx, Test::testFdo64350},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1088,6 +1090,13 @@ void Test::testFdo65718()
CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(114300) + 1),
getPropertysal_Int32(xPropertySet, RightMargin) );
}
+void Test::testFdo64350()
+{
+// The problem was that page border shadows were not exported
+table::ShadowFormat aShadow =
getPropertytable::ShadowFormat(getStyles(PageStyles)-getByName(DEFAULT_STYLE),
ShadowFormat);
+CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, aShadow.Location);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 16fc3b0..820d06c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1482,7 +1482,7 @@ void DocxAttributeOutput::ParagraphStyle( sal_uInt16
nStyle )
m_pSerializer-singleElementNS( XML_w, XML_pStyle, FSNS( XML_w, XML_val ),
aStyleId.getStr(), FSEND );
}
-static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken,
const SvxBorderLine* pBorderLine, sal_uInt16 nDist )
+static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken,
const SvxBorderLine* pBorderLine, sal_uInt16 nDist, bool bWriteShadow = false )
{
FastAttributeList* pAttr = pSerializer-createAttrList();
@@ -1578,6 +1578,12 @@ static void impl_borderLine( FSHelperPtr pSerializer,
sal_Int32 elementToken, co
pAttr-add( FSNS( XML_w, XML_color ), sColor );
}
+if (bWriteShadow)
+{
+// Set the shadow value
+pAttr-add( FSNS( XML_w, XML_shadow ), 1 );
+}
+
XFastAttributeListRef xAttrs( pAttr );
pSerializer-singleElementNS( XML_w, elementToken, xAttrs );
}
@@ -1591,6 +1597,7 @@ static OutputBorderOptions
lcl_getTableDefaultBorderOptions(bool bEcma)
rOptions.bWriteTag = true;
rOptions.bWriteInsideHV = true;
rOptions.bWriteDistance = false;
+rOptions.aShadowLocation = SVX_SHADOW_NONE;
rOptions.bCheckDistanceSize = false;
return rOptions;
@@ -1605,6 +1612,7 @@ static OutputBorderOptions
lcl_getTableCellBorderOptions(bool bEcma)
rOptions.bWriteTag = true;
rOptions.bWriteInsideHV = true;
rOptions.bWriteDistance = false;
+rOptions.aShadowLocation = SVX_SHADOW_NONE;
rOptions.bCheckDistanceSize = false;
return rOptions;
@@ -1619,6 +1627,7 @@ static OutputBorderOptions lcl_getBoxBorderOptions()
rOptions.bWriteTag = false;
rOptions.bWriteInsideHV = false;
rOptions.bWriteDistance = true;
+rOptions.aShadowLocation = SVX_SHADOW_NONE;
rOptions.bCheckDistanceSize = false;
return rOptions;
@@ -1665,11 +1674,42 @@ static void impl_borders( FSHelperPtr pSerializer,
const SvxBoxItem rBox, const
{
const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
-if (!tagWritten rOptions.bWriteTag) {
+if (!tagWritten rOptions.bWriteTag)
+{
pSerializer-startElementNS( XML_w, rOptions.tag, FSEND );
tagWritten = true;
}
+bool bWriteShadow = false;
+if (rOptions.aShadowLocation == SVX_SHADOW_NONE)
+{
+// The border has no shadow
+}
+else if (rOptions.aShadowLocation ==
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/cmdoptions.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7afc29809ec9db8c5064d5b5857f64db9bd843be Author: Matteo Casalin matteo.casa...@yahoo.com Date: Tue Jul 30 14:06:51 2013 +0200 Typos in debug messages Change-Id: I0b06af28959d7254b1aaca6e05c51311294bc3e7 diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index f1cf83d..116b5d8 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -264,7 +264,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence OUString ) // Safe impossible cases. // We need values from ALL configuration keys. // Follow assignment use order of values in relation to our list of key names! -DBG_ASSERT( !(lNames.getLength()!=lValues.getLength()), SvtCommandOptions_Impl::SvtCommandOptions_Impl()\nI miss some values of configuration keys!\n ); +DBG_ASSERT( !(lNames.getLength()!=lValues.getLength()), SvtCommandOptions_Impl::Notify()\nI miss some values of configuration keys!\n ); // Copy values from list in right order to ouer internal member. // Attention: List for names and values have an internal construction pattern! @@ -324,7 +324,7 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption return m_aDisabledCommands.Lookup( aCommand ); } default: -DBG_ASSERT( sal_False, SvtCommandOptions_Impl::GetList()\nUnknown option type given!\n ); +DBG_ASSERT( sal_False, SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n ); } return sal_False; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig include/svx svx/source
cui/uiconfig/ui/charnamepage.ui | 402 +--- cui/uiconfig/ui/effectspage.ui | 32 --- cui/uiconfig/ui/positionpage.ui | 45 +--- cui/uiconfig/ui/twolinespage.ui | 100 - include/svx/fntctrl.hxx |2 svx/source/dialog/fntctrl.cxx | 12 - 6 files changed, 259 insertions(+), 334 deletions(-) New commits: commit fd424dd6fcf367da671b6d31a64465cb0751a026 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 29 19:51:04 2013 +0100 Related: fdo#67395 adjust height of font name tabpage, etc. + put the language label beside the language listbox which reduces height by a line + use standard spacing between frames in position tabpage + use standard spacing horizonally between elements (cherry picked from commit 1d33fc35f787061c9440ba44dfd53de405bd430a) Related: fdo#67395 drop 'Preview' frame title it's clear that it's a preview, move that string into its Accessible name for those that can't see the preview (cherry picked from commit 1193dc782f4479a81f3d283c99df2f5c7e022682) Related: fdo#67395 drop 'Font' frame title + promote the family, style, size to frame titles and drop the surrounding 'Font' one + bottom align the previews again + drop empty spacing labels in favour of 6pixel spacing (cherry picked from commit 63ced8e54f1786e5814f082c9fb87c89e5c850a9) Related: fdo#67395 add border to preview to cut up whitespace (cherry picked from commit 167416c3ed3ed52249559ff3548c0fc06d0d0eef) Change-Id: I1191db7aaf0922978bf6dd8da17ec4f133944b94 684f451542f5300cc206c9ade7f3b130b1c3c876 2c0b78163894c5283162c37bd71fa1bbc3c341c7 c66bf59294f7c9fb4059574765734749a40b043f Reviewed-on: https://gerrit.libreoffice.org/5200 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 89bc974..d89402d 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkBox id=CharNamePage property name=visibleTrue/property property name=can_focusFalse/property @@ -8,200 +9,203 @@ property name=orientationvertical/property property name=spacing12/property child - object class=GtkFrame id=simple + object class=GtkGrid id=simple property name=can_focusFalse/property property name=no_show_allTrue/property -property name=label_xalign0/property -property name=shadow_typenone/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=row_spacing6/property +property name=column_spacing12/property child - object class=GtkAlignment id=alignment5 + object class=GtkLabel id=westfontinfo-nocjk property name=visibleTrue/property property name=can_focusFalse/property -property name=top_padding6/property -property name=left_padding12/property +property name=margin_top6/property +property name=xalign0/property + /object + packing +property name=left_attach0/property +property name=top_attach2/property +property name=width3/property +property name=height1/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=halignstart/property +property name=spacing12/property +child + object class=GtkLabel id=westlangft-nocjk +property name=visibleTrue/property +property name=can_focusFalse/property +property name=halignstart/property +property name=hexpandTrue/property +property name=xalign0/property +property name=label translatable=yesLanguage/property +property name=use_underlineTrue/property +property name=mnemonic_widgetwestlanglb-nocjk/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child child - object class=GtkGrid id=grid4 + object class=svxcorelo-SvxLanguageBox id=westlanglb-nocjk +property name=visibleTrue/property +property name=can_focusFalse/property +property name=halignstart/property +
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source officecfg/registry postprocess/CustomTarget_registry.mk
basctl/source/basicide/codecompleteoptionsdlg.cxx |8 officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu |4 ++-- postprocess/CustomTarget_registry.mk |2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) New commits: commit cbe6c15c676641a51c5504613eb939fec846e670 Author: Gergo Mocsi gmocs...@gmail.com Date: Tue Jul 30 14:48:57 2013 +0200 GSOC work, config crach fix Storing code completition data in config file is fully functional. Change-Id: If9a974dd0ed052e26963ad5f202493674f1a51ca diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx b/basctl/source/basicide/codecompleteoptionsdlg.cxx index aa887a2..130f361 100644 --- a/basctl/source/basicide/codecompleteoptionsdlg.cxx +++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx @@ -42,13 +42,13 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window* pWindow ) pOkBtn-SetClickHdl( LINK( this, CodeCompleteOptionsDlg, OkHdl ) ); pCancelBtn-SetClickHdl( LINK( this, CodeCompleteOptionsDlg, CancelHdl ) ); -//LoadConfig(); +LoadConfig(); -pCodeCompleteChk-Check( CodeCompleteOptions::IsCodeCompleteOn() ); +/*pCodeCompleteChk-Check( CodeCompleteOptions::IsCodeCompleteOn() ); pAutocloseProcChk-Check( CodeCompleteOptions::IsProcedureAutoCompleteOn() ); pAutocloseQuotesChk-Check( CodeCompleteOptions::IsAutoCloseQuotesOn() ); pAutocloseParenChk-Check( CodeCompleteOptions::IsAutoCloseParenthesisOn() ); -pAutoCorrectSpellingChk-Check( CodeCompleteOptions::IsAutoCorrectSpellingOn() ); +pAutoCorrectSpellingChk-Check( CodeCompleteOptions::IsAutoCorrectSpellingOn() );*/ } @@ -64,7 +64,7 @@ IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl) CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk-IsChecked() ); CodeCompleteOptions::SetAutoCorrectSpellingOn( pAutoCorrectSpellingChk-IsChecked() ); -//SaveConfig(); +SaveConfig(); Close(); return 0; } diff --git a/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu b/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu index 283d804..d3f7498 100644 --- a/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu +++ b/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu @@ -18,7 +18,7 @@ -- !DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd oor:component-data xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:install=http://openoffice.org/2004/installation; oor:name=BasicIDE oor:package=org.openoffice.Office -node oor:name=Autocomplete oor:op=replace +!--node oor:name=Autocomplete oor:op=replace prop oor:name=CodeComplete valuefalse/value /prop @@ -34,5 +34,5 @@ prop oor:name=AutoCorrectSpelling valuefalse/value /prop -/node +/node!-- /oor:component-data diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index fa2b139..1743e51 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -137,6 +137,7 @@ postprocess_FILES_main := \ $(postprocess_XCS)/LDAP.xcs \ $(postprocess_XCS)/Office/Accelerators.xcs \ $(postprocess_XCS)/Office/Addons.xcs \ + $(postprocess_XCS)/Office/BasicIDE.xcs \ $(postprocess_XCS)/Office/Calc.xcs \ $(postprocess_XCS)/Office/CalcAddIns.xcs \ $(postprocess_XCS)/Office/Canvas.xcs \ @@ -221,6 +222,7 @@ postprocess_FILES_main := \ $(postprocess_XCU)/Inet.xcu \ $(postprocess_XCU)/Interaction.xcu \ $(postprocess_XCU)/Office/Accelerators.xcu \ + $(postprocess_XCU)/Office/BasicIDE.xcu \ $(postprocess_XCU)/Office/Calc.xcu \ $(postprocess_XCU)/Office/Canvas.xcu \ $(postprocess_XCU)/Office/Common.xcu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] Add NSAXSpy to help debugging OS X accessibility
Cool, Is this the patch where I can flag any of my colleagues as enemy of the state from within LO so they get a free trip to a nice bay in Cuba? 2013/7/28 Boris Dušek (via Code Review) ger...@gerrit.libreoffice.org Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5160 Approvals: Boris Dušek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5160 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7f4dbed4924b8f5330726d378eda3601991f404 Gerrit-PatchSet: 2 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Boris Dušek m...@dusek.me Gerrit-Reviewer: Boris Dušek m...@dusek.me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source include/editeng sw/inc sw/source
editeng/source/misc/SvXMLAutoCorrectImport.cxx |9 +
editeng/source/misc/svxacorr.cxx |9 +
include/editeng/svxacorr.hxx |7 ---
sw/inc/swacorr.hxx |7 ---
sw/source/core/inc/SwXMLBlockImport.hxx|5 ++---
sw/source/core/inc/SwXMLTextBlocks.hxx |8
sw/source/core/inc/swblocks.hxx|6 +++---
sw/source/core/sw3io/swacorr.cxx | 10 ++
sw/source/core/swg/SwXMLBlockImport.cxx|2 +-
sw/source/core/swg/SwXMLBlockListContext.cxx |8
sw/source/core/swg/SwXMLTextBlocks.cxx |6 +++---
sw/source/core/swg/SwXMLTextBlocks1.cxx|4 ++--
12 files changed, 43 insertions(+), 38 deletions(-)
New commits:
commit 73a136945d50a207c9e1c552d02c90d5c862c470
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Fri Jul 26 15:37:08 2013 +0200
String to OUString
Change-Id: Ia9bebaf92bf570c10d01a9ed3db437f70098a07d
Reviewed-on: https://gerrit.libreoffice.org/5185
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 9b4de02..b338b95 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -100,7 +100,8 @@ SvXMLWordContext::SvXMLWordContext(
SvXMLImportContext ( rImport, nPrefix, rLocalName ),
rLocalRef(rImport)
{
-String sRight, sWrong;
+OUString sRight;
+OUString sWrong;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList-getLength() : 0;
for (sal_Int16 i=0; i nAttrCount; i++)
@@ -121,15 +122,15 @@ SvXMLWordContext::SvXMLWordContext(
}
}
}
-if (!sWrong.Len() || !sRight.Len() )
+if (sWrong.isEmpty() || sRight.isEmpty())
return;
sal_Bool bOnlyTxt = sRight != sWrong;
if( !bOnlyTxt )
{
-String sLongSave( sRight );
+const OUString sLongSave( sRight );
if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, String(),
sWrong, sRight )
-sLongSave.Len() )
+!sLongSave.isEmpty() )
{
sRight = sLongSave;
bOnlyTxt = sal_True;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d40f481..8b651a6 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1609,14 +1609,15 @@ sal_Bool SvxAutoCorrect::MakeCombinedChanges(
std::vectorSvxAutocorrWord aNew
// - return the replacement text (only for SWG-Format, all other
// can be taken from the word list!)
-sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage , const String, const String , String )
+sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage ,
+ const String, const String, OUString )
{
return sal_False;
}
// Text with attribution (only the SWG - SWG format!)
-sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage , const String, const String,
SfxObjectShell,
-String )
+sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage ,
+ const String, const String,
SfxObjectShell, OUString )
{
return sal_False;
}
@@ -2541,7 +2542,7 @@ sal_Bool SvxAutoCorrectLanguageLists::PutText( const
String rShort,
MakeUserStorage_Impl();
sal_Bool bRet = sal_False;
-String sLong;
+OUString sLong;
try
{
uno::Reference embed::XStorage xStg =
comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile,
embed::ElementModes::READWRITE );
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 85bf3e9..0a493d7 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -267,8 +267,8 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
protected:
// - Text with attribution (only the SWG - SWG format!)
// rShort is the stream name - encrypted!
-virtual sal_Bool PutText( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage rStg, const String rFileName, const String
rShort, SfxObjectShell ,
-String );
+virtual sal_Bool PutText( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage rStg,
+ const String rFileName, const String rShort,
SfxObjectShell, OUString );
// required language in the table add if possible only when the file exists
sal_BoolCreateLanguageFile(LanguageType eLang, sal_Bool bNewFile =
sal_True);
@@ -279,7 +279,8 @@ public:
sal_Unicode GetQuote(
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unobkm.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 5f7860bc2735bad3cd27552867ce25096835dcbb
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Jul 28 13:20:56 2013 +0200
OUString: remove unnecessary casts and appends
Change-Id: Ib64b976ac94cba64d9f7c0cbfead3890277ec9ca
Reviewed-on: https://gerrit.libreoffice.org/5188
Reviewed-by: Andrzej J.R. Hunt andr...@ahunt.org
Tested-by: Andrzej J.R. Hunt andr...@ahunt.org
diff --git a/sw/source/core/unocore/unobkm.cxx
b/sw/source/core/unocore/unobkm.cxx
index 8e6324b..acffc53 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -47,10 +47,9 @@ namespace
{
static OUString lcl_QuoteName(const OUString rName)
{
-static const OUString sStart =
OUString(String(SW_RES(STR_START_QUOTE)));
-static const OUString sEnd = OUString(String(SW_RES(STR_END_QUOTE)));
-OUStringBuffer sBuf(64);
-return
sBuf.append(sStart).append(rName).append(sEnd).makeStringAndClear();
+static const OUString sStart = SW_RES(STR_START_QUOTE);
+static const OUString sEnd = SW_RES(STR_END_QUOTE);
+return sStart + rName + sEnd;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/PostItMgr.hxx|4 ++--
sw/inc/authfld.hxx |4 ++--
sw/inc/bparr.hxx|1 -
sw/inc/dcontact.hxx |7 ++-
sw/inc/ndtxt.hxx|5 ++---
sw/inc/switerator.hxx |4 ++--
sw/inc/swrect.hxx |4 ++--
sw/inc/tox.hxx | 43 +--
sw/inc/txatbase.hxx | 33 -
sw/inc/txtatr.hxx |2 +-
sw/inc/txtfld.hxx |2 +-
sw/inc/txtftn.hxx |2 +-
sw/inc/txtinet.hxx |2 +-
sw/inc/txtrfmrk.hxx |2 +-
sw/inc/txttxmrk.hxx |2 +-
sw/inc/unobaseclass.hxx |3 +--
16 files changed, 52 insertions(+), 68 deletions(-)
New commits:
commit d7b48d03e19d2c05ecf2143b1547ceab5ab89e5c
Author: Honza HavlÃÄek havlicek.ho...@gmail.com
Date: Sat Jul 27 03:14:27 2013 +0200
fdo#43157 - Clean up OSL_ENSURE
Change-Id: I5ba15eaa82479aa68b98ce4dcd7827f31b239c98
Reviewed-on: https://gerrit.libreoffice.org/5139
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index c8dc432..6a605a3 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -108,9 +108,9 @@ class SwNoteProps: public utl::ConfigItem
const ::com::sun::star::uno::Sequence OUString rNames =
GetPropertyNames();
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any
aValues = GetProperties(rNames);
const ::com::sun::star::uno::Any* pValues =
aValues.getConstArray();
- OSL_ENSURE(aValues.getLength() == rNames.getLength(),
GetProperties failed);
+SAL_WARN_IF(aValues.getLength() != rNames.getLength(), sw,
GetProperties failed);
if (aValues.getLength())
-pValues[0]=bIsShowAnchor;
+pValues[0]=bIsShowAnchor;
}
bool IsShowAnchor()
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 516120b..e385329 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -170,12 +170,12 @@ public:
// --- inlines ---
inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const
{
-OSL_ENSURE(AUTH_FIELD_END ePos, wrong index);
+SAL_WARN_IF(AUTH_FIELD_END = ePos, sw, wrong index);
return aAuthFields[ePos];
}
inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const
OUString rField)
{
-OSL_ENSURE(AUTH_FIELD_END ePos, wrong index);
+SAL_WARN_IF(AUTH_FIELD_END = ePos, sw, wrong index);
if(AUTH_FIELD_END ePos)
aAuthFields[ePos] = rField;
}
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 6cac07c..5b0cda2 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -23,7 +23,6 @@
#include assert.h
#include tools/solar.h
-#include osl/diagnose.h
#include swdllapi.h
struct BlockInfo;
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index eb02ac5..6dc76cb 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -152,8 +152,7 @@ public:
about the object (Writer fly frame resp. drawing object) */
const SwFmtAnchor GetAnchorFmt() const
{
-OSL_ENSURE( GetFmt(),
-SwContact::GetAnchorFmt() - no frame format - crash );
+assert( GetFmt() );
return GetFmt()-GetAnchor();
}
@@ -167,9 +166,7 @@ public:
const SwPosition GetCntntAnchor() const
{
-OSL_ENSURE( GetAnchorFmt().GetCntntAnchor(),
-SwContact::GetCntntAnchor() - no content anchor - crash );
-
+assert( GetAnchorFmt().GetCntntAnchor() );
return *(GetAnchorFmt().GetCntntAnchor());
}
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 8e41570..125b723 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -28,7 +28,6 @@
#include modeltoviewhelper.hxx
#include SwNumberTreeTypes.hxx
#include IDocumentContentOperations.hxx
-#include osl/diagnose.h
#include sfx2/Metadatable.hxx
@@ -818,12 +817,12 @@ public:
inline SwpHints SwTxtNode::GetSwpHints()
{
-OSL_ASSERT( m_pSwpHints );
+assert( m_pSwpHints );
return *m_pSwpHints;
}
inline const SwpHints SwTxtNode::GetSwpHints() const
{
-OSL_ASSERT( m_pSwpHints );
+assert( m_pSwpHints );
return *m_pSwpHints;
}
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx
index 249a8bb..190e14e 100644
--- a/sw/inc/switerator.hxx
+++ b/sw/inc/switerator.hxx
@@ -20,14 +20,14 @@
#define _SWITERATOR_HXX
#include calbck.hxx
-#include osl/diagnose.h
+#include sal/log.hxx
template class TElementType, class TSource class SwIterator
{
SwClientIter aClientIter;
public:
-SwIterator( const TSource rSrc ) : aClientIter(rSrc) { OSL_ENSURE(
TElementType::IsOf( TYPE(SwClient) ), Incompatible types! ); }
+SwIterator( const TSource rSrc ) : aClientIter(rSrc) { SAL_WARN_IF(
!TElementType::IsOf( TYPE(SwClient) ), sw, Incompatible
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source svtools/source
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/directsql.cxx | 66 ++---
dbaccess/source/ui/inc/directsql.hxx | 18 -
dbaccess/uiconfig/ui/directsqldialog.ui| 277 +
extras/source/glade/libreoffice-catalog.xml.in |6
svtools/source/edit/editsyntaxhighlighter.cxx |6
svtools/source/edit/svmedit.cxx|6
7 files changed, 330 insertions(+), 50 deletions(-)
New commits:
commit 471e5c1ed19afde8a92a91bfc1ccc71a2506cc01
Author: Csikós Tamás csks.t...@gmail.com
Date: Mon Jul 29 19:54:43 2013 +0200
modern .ui widgetlayout for directsql
Change-Id: I51140fe6abd2d321c5784b923f920ab9183f417e
Reviewed-on: https://gerrit.libreoffice.org/5171
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eb97972..cace6a8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
+dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/generalpagedialog \
dbaccess/uiconfig/ui/generalpagewizard \
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index bb73d8a..87b9173 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -73,33 +73,25 @@ namespace dbaui
DBG_NAME(DirectSQLDialog)
//
DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference
XConnection _rxConn )
-:ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL))
-,m_aFrame (this, ModuleRes(FL_SQL))
-,m_aSQLLabel(this, ModuleRes(FT_SQL))
-,m_aSQL (this, ModuleRes(ME_SQL))
-,m_aExecute (this, ModuleRes(PB_EXECUTE))
-,m_aHistoryLabel(this, ModuleRes(FT_HISTORY))
-,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY)))
-,m_aStatusFrame (this, ModuleRes(FL_STATUS))
-,m_aStatus (this, ModuleRes(ME_STATUS))
-,m_pShowOutput(new CheckBox(this, ModuleRes(CB_SHOWOUTPUT)))
-,m_aOutputFrame (this, ModuleRes(FL_OUTPUT))
-,m_aOutput (this, ModuleRes(ME_OUTPUT))
-,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS))
-,m_aHelp(this, ModuleRes(PB_HELP))
-,m_aClose (this, ModuleRes(PB_CLOSE))
+:ModalDialog(_pParent, DirectSQLDialog ,
dbaccess/ui/directsqldialog.ui)
,m_nHistoryLimit(20)
,m_nStatusCount(1)
,m_xConnection(_rxConn)
{
-DBG_CTOR(DirectSQLDialog,NULL);
+get(m_pSQL,sql);
+get(m_pExecute,execute);
+get(m_pSQLHistory,sqlhistory);
+get(m_pStatus,status);
+get(m_pShowOutput,showoutput);
+get(m_pOutput,output);
+get(m_pClose,close);
-FreeResource();
+DBG_CTOR(DirectSQLDialog,NULL);
-m_aSQL.GrabFocus();
+m_pSQL-GrabFocus();
-m_aExecute.SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
-m_aClose.SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
+m_pExecute-SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
+m_pClose-SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
m_pSQLHistory-SetSelectHdl(LINK(this, DirectSQLDialog,
OnListEntrySelected));
m_pSQLHistory-SetDropDownLineCount(10);
@@ -109,8 +101,8 @@ DBG_NAME(DirectSQLDialog)
if (xConnComp.is())
startComponentListening(xConnComp);
-m_aSQL.SetModifyHdl(LINK(this, DirectSQLDialog, OnStatementModified));
-OnStatementModified(m_aSQL);
+m_pSQL-SetModifyHdl(LINK(this, DirectSQLDialog, OnStatementModified));
+OnStatementModified(m_pSQL);
}
//
@@ -120,8 +112,6 @@ DBG_NAME(DirectSQLDialog)
::osl::MutexGuard aGuard(m_aMutex);
stopAllComponentListening();
}
-delete m_pSQLHistory;
-delete m_pShowOutput;
DBG_DTOR(DirectSQLDialog,NULL);
}
@@ -226,7 +216,7 @@ DBG_NAME(DirectSQLDialog)
OSL_ENSURE(xStatement.is(),
DirectSQLDialog::implExecuteStatement: no statement returned by the
connection!);
// clear the output box
-m_aOutput.SetText(OUString());
+m_pOutput-SetText(OUString());
if (xStatement.is())
{
if
(OUString(_rStatement).toAsciiUpperCase().startsWith(SELECT)
m_pShowOutput-IsChecked())
@@ -288,10 +278,10 @@ DBG_NAME(DirectSQLDialog)
{
OUString
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dochdl/selglos.cxx |6 ++
sw/source/ui/inc/selglos.hxx| 12 +---
2 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit 38e54583bcf07a71974777d13d2cf98519c8635b
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Jul 28 00:14:47 2013 +0200
String to OUString
Change-Id: I531522908c9d1ef6eefa0bc6026229f16a8ac388
Reviewed-on: https://gerrit.libreoffice.org/5187
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index b87ce8d..930fb82 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -30,7 +30,7 @@
// CTOR / DTOR ---
-SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const String rShortName)
+SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const OUString
rShortName)
: ModalDialog(pParent, SW_RES(DLG_SEL_GLOS)),
aGlosBox(this, SW_RES( LB_GLOS)),
aGlosFL(this, SW_RES( FL_GLOS)),
@@ -38,9 +38,7 @@ SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const
String rShortName)
aCancelBtn(this, SW_RES( BT_CANCEL)),
aHelpBtn(this, SW_RES(BT_HELP))
{
-String sText(aGlosFL.GetText());
-sText += rShortName;
-aGlosFL.SetText(sText);
+aGlosFL.SetText(aGlosFL.GetText() + rShortName);
FreeResource();
aGlosBox.SetDoubleClickHdl(LINK(this, SwSelGlossaryDlg, DoubleClickHdl));
diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx
index d73b5a9..88da014 100644
--- a/sw/source/ui/inc/selglos.hxx
+++ b/sw/source/ui/inc/selglos.hxx
@@ -37,19 +37,17 @@ protected:
DECL_LINK(DoubleClickHdl, ListBox*);
public:
-SwSelGlossaryDlg(Window * pParent, const String rShortName);
+SwSelGlossaryDlg(Window * pParent, const OUString rShortName);
~SwSelGlossaryDlg();
-void InsertGlos(const String rRegion, const String rGlosName);//
inline
+void InsertGlos(const OUString rRegion, const OUString rGlosName);//
inline
sal_uInt16 GetSelectedIdx() const; // inline
void SelectEntryPos(sal_uInt16 nIdx); // inline
};
-inline void SwSelGlossaryDlg::InsertGlos(const String rRegion,
-const String rGlosName)
+inline void SwSelGlossaryDlg::InsertGlos(const OUString rRegion,
+const OUString rGlosName)
{
-String aTmp( rRegion );
-aTmp += ':';
-aTmp += rGlosName;
+const OUString aTmp = rRegion + : + rGlosName;
aGlosBox.InsertEntry( aTmp );
}
inline sal_uInt16 SwSelGlossaryDlg::GetSelectedIdx() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/gdi/salprn.cxx |4 1 file changed, 4 insertions(+) New commits: commit 3a897cf0514612137c6b5cb57f8b1e0d9623106f Author: Tor Lillqvist t...@iki.fi Date: Tue Jul 30 17:30:10 2013 +0300 Adapt to NSPrintInfo API change Change-Id: Idce313b30b46a81847e116c380f6fe8eb2953a35 diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 6b61398..a71c8d6 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -69,7 +69,11 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo i_rQueue ) : mpPrintInfo = [pShared copy]; [mpPrintInfo setPrinter: mpPrinter]; mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; +#if MACOSX_SDK_VERSION = 1090 +[mpPrintInfo setOrientation: NSPaperOrientationPortrait]; +#else [mpPrintInfo setOrientation: NSPortraitOrientation]; +#endif } mpGraphics = new AquaSalGraphics(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/generic
vcl/generic/fontmanager/fontconfig.cxx | 37 +++--
1 file changed, 22 insertions(+), 15 deletions(-)
New commits:
commit 1c48e4efa2369e5708798bdefb46b74a86415d00
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 30 16:11:54 2013 +0200
fdo#66715: fontconfig: try harder to ignore duplicate fonts
The thin space not being displayed correctly is caused by using the
wrong font, namely
/usr/share/fonts/liberation/LiberationSerif-Regular.ttf,
which (on Fedora 18) is version 1 and does not contain u2006 etc.
glyphs, whereas the LiberationSerif-Regular.ttf bundled with LO
is version 2 and does contain these.
There is already isPreviouslyDuplicateOrObsoleted() function to ignore
older fonts but it does not work for this case because:
1) Only the previous element was looked at, but there may be several
fonts with different weight/slant that need to be checked.
2) The LiberationSerif-Regular.ttf differ in the lang entry.
Change-Id: I2f9e8d50a1f8155b65f8f07c9259dd988c32992a
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 6bd45c9..769826d 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -209,30 +209,37 @@ namespace
//on being sorted with SortFont
bool isPreviouslyDuplicateOrObsoleted(FcFontSet *pFSet, int i)
{
-if (i == 0)
-return false;
-
const FcPattern *a = pFSet-fonts[i];
-const FcPattern *b = pFSet-fonts[i-1];
-
-if (compareFontNames(a, b) != 0)
-return false;
FcPattern* pTestPatternA = FcPatternDuplicate(a);
FcPatternDel(pTestPatternA, FC_FILE);
FcPatternDel(pTestPatternA, FC_CHARSET);
FcPatternDel(pTestPatternA, FC_CAPABILITY);
FcPatternDel(pTestPatternA, FC_FONTVERSION);
+FcPatternDel(pTestPatternA, FC_LANG);
+
+bool bIsDup(false);
-FcPattern* pTestPatternB = FcPatternDuplicate(b);
-FcPatternDel(pTestPatternB, FC_FILE);
-FcPatternDel(pTestPatternB, FC_CHARSET);
-FcPatternDel(pTestPatternB, FC_CAPABILITY);
-FcPatternDel(pTestPatternB, FC_FONTVERSION);
+// fdo#66715: loop for case of several font files for same font
+for (int j = i - 1; 0 = j !bIsDup; --j)
+{
+const FcPattern *b = pFSet-fonts[j];
-bool bIsDup = FcPatternEqual(pTestPatternA, pTestPatternB);
+if (compareFontNames(a, b) != 0)
+break;
+
+FcPattern* pTestPatternB = FcPatternDuplicate(b);
+FcPatternDel(pTestPatternB, FC_FILE);
+FcPatternDel(pTestPatternB, FC_CHARSET);
+FcPatternDel(pTestPatternB, FC_CAPABILITY);
+FcPatternDel(pTestPatternB, FC_FONTVERSION);
+FcPatternDel(pTestPatternB, FC_LANG);
+
+bIsDup = FcPatternEqual(pTestPatternA, pTestPatternB);
+
+FcPatternDestroy(pTestPatternB);
+}
-FcPatternDestroy(pTestPatternB);
FcPatternDestroy(pTestPatternA);
return bIsDup;
commit 90dadcc9a0fc3d089f9318f073ce8374e4632da4
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 29 22:43:20 2013 +0200
vcl: fix obviously wrong mapping of WIDTH_ULTRA_EXPANDED
Change-Id: I2f23f51e7f04df6fcbc1e2d6661949b830cc248e
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 4768572..6bd45c9 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -777,7 +777,7 @@ static void addtopattern(FcPattern *pPattern,
case WIDTH_SEMI_EXPANDED: nWidth = FC_WIDTH_SEMIEXPANDED;break;
case WIDTH_EXPANDED:nWidth = FC_WIDTH_EXPANDED;break;
case WIDTH_EXTRA_EXPANDED: nWidth = FC_WIDTH_EXTRAEXPANDED;break;
-case WIDTH_ULTRA_EXPANDED: nWidth = FC_WIDTH_ULTRACONDENSED;break;
+case WIDTH_ULTRA_EXPANDED: nWidth = FC_WIDTH_ULTRAEXPANDED;break;
default:
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/qa editeng/source include/editeng sw/inc sw/source
editeng/qa/unit/core-test.cxx |2 -
editeng/source/editeng/edtspell.cxx |2 -
editeng/source/editeng/edtspell.hxx |2 -
include/editeng/svxacorr.hxx|2 -
sw/inc/crsrsh.hxx |2 -
sw/inc/doc.hxx |2 -
sw/inc/editsh.hxx |2 -
sw/inc/fmtinfmt.hxx | 29 +--
sw/source/core/access/acchyperlink.cxx |8 ++---
sw/source/core/bastyp/init.cxx |2 -
sw/source/core/crsr/crstrvl.cxx |4 +-
sw/source/core/doc/doc.cxx |4 +-
sw/source/core/doc/docfmt.cxx |4 +-
sw/source/core/doc/docglbl.cxx |2 -
sw/source/core/edit/acorrect.cxx|4 +-
sw/source/core/edit/editsh.cxx | 10 +++---
sw/source/core/inc/acorrect.hxx |2 -
sw/source/core/txtnode/fmtatr2.cxx | 42
sw/source/core/txtnode/txtatr2.cxx |2 -
sw/source/filter/html/htmlatr.cxx |4 +-
sw/source/filter/html/htmlgrin.cxx |2 -
sw/source/filter/ww8/rtfattributeoutput.cxx |2 -
sw/source/filter/ww8/ww8atr.cxx |6 ++--
sw/source/ui/dochdl/swdtflvr.cxx|8 ++---
sw/source/ui/wrtsh/wrtsh2.cxx | 21 ++
25 files changed, 92 insertions(+), 78 deletions(-)
New commits:
commit 31ab7f0c7d20f1d7be5ce818d0d99b6bd5a8edde
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Jul 28 16:40:20 2013 +0200
String to OUString
Change-Id: I8d4f62b473ad43807621a9dbb826ed33857b737e
Reviewed-on: https://gerrit.libreoffice.org/5189
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 0975efb..ae3749c 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -253,7 +253,7 @@ private:
//fprintf(stderr, TestAutoCorrDoc::SetAttr\n);
return true;
}
-virtual sal_Bool SetINetAttr( xub_StrLen, xub_StrLen, const String )
+virtual sal_Bool SetINetAttr( xub_StrLen, xub_StrLen, const OUString )
{
//fprintf(stderr, TestAutoCorrDoc::SetINetAttr\n);
return true;
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index 3e1a3c9..37b1bf6f 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -660,7 +660,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt,
sal_uInt16 nEnd,
}
sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
-const String rURL )
+const OUString rURL )
{
// Turn the Text into a command field ...
EditSelection aSel( EditPaM( pCurNode, nStt ), EditPaM( pCurNode, nEnd ) );
diff --git a/editeng/source/editeng/edtspell.hxx
b/editeng/source/editeng/edtspell.hxx
index 699a6df..7df5e08 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -148,7 +148,7 @@ public:
virtual sal_BoolReplaceRange( xub_StrLen nPos, xub_StrLen nLen, const
String rTxt );
virtual sal_BoolSetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, sal_uInt16
nSlotId, SfxPoolItem );
-virtual sal_BoolSetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, const
String rURL );
+virtual sal_BoolSetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, const
OUString rURL );
virtual const String* GetPrevPara( sal_Bool bAtNormalPos );
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 0a493d7..a90f14f 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -96,7 +96,7 @@ public:
virtual sal_Bool SetAttr( xub_StrLen nStt, xub_StrLen nEnd, sal_uInt16
nSlotId,
SfxPoolItem ) = 0;
-virtual sal_Bool SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const
String rURL ) = 0;
+virtual sal_Bool SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const
OUString rURL ) = 0;
// Return the text of a previous paragraph. This must not be empty!
// If no paragraph exits or just an empty one, then return 0.
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index a652acc..61a7d2a 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -777,7 +777,7 @@ public:
sal_Bool SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const
SwTxtAttr* pAttr = 0 );
bool GotoINetAttr( const SwTxtINetFmt rAttr );
-const SwFmtINetFmt* FindINetAttr( const String rName ) const;
+const SwFmtINetFmt* FindINetAttr( const OUString rName ) const;
sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 854b869..b032324 100644
--- a/sw/inc/doc.hxx
+++
[Libreoffice-commits] core.git: filter/AllLangResTarget_xsltdlg.mk filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
filter/AllLangResTarget_xsltdlg.mk |1
filter/UIConfig_xsltdlg.mk |1
filter/source/xsltdialog/xmlfilterhelpids.hrc|1
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 13 -
filter/source/xsltdialog/xmlfiltertabdialog.src |1
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx| 103 -
filter/source/xsltdialog/xmlfiltertabpagexslt.hrc| 41 ---
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx| 28 +-
filter/source/xsltdialog/xmlfiltertabpagexslt.src| 160 --
filter/uiconfig/ui/xmlfiltertabpagetransformation.ui | 217 +++
10 files changed, 282 insertions(+), 284 deletions(-)
New commits:
commit 9ed24d6625e6e0c29a60a1b04a907243a5c35ca4
Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Date: Tue Jul 30 14:59:03 2013 +0300
Convert xml filter tabpage transformation to .ui
Change-Id: Ice69f7d036d414c82f6c313a8dc025f736b97e68
Reviewed-on: https://gerrit.libreoffice.org/5201
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/filter/AllLangResTarget_xsltdlg.mk
b/filter/AllLangResTarget_xsltdlg.mk
index 5c79404..316d0a2 100644
--- a/filter/AllLangResTarget_xsltdlg.mk
+++ b/filter/AllLangResTarget_xsltdlg.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\
$(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\
filter/source/xsltdialog/xmlfiltertabdialog.src \
- filter/source/xsltdialog/xmlfiltertabpagexslt.src \
filter/source/xsltdialog/xmlfilterdialogstrings.src \
))
diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index bb12d74..a54c4e8 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\
filter/uiconfig/ui/testxmlfilter \
filter/uiconfig/ui/xmlfiltersettings \
filter/uiconfig/ui/xmlfiltertabpagegeneral \
+ filter/uiconfig/ui/xmlfiltertabpagetransformation \
))
# vim: set noet sw=4 ts=4:
diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc
b/filter/source/xsltdialog/xmlfilterhelpids.hrc
index b2f18eb..b87c23f 100644
--- a/filter/source/xsltdialog/xmlfilterhelpids.hrc
+++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc
@@ -22,7 +22,6 @@
#define HID_XML_SOURCE_FILE_DIALOG
FILTER_HID_XML_SOURCE_FILE_DIALOG
#define HID_XML_FILTER_TABDIALOG
FILTER_HID_XML_FILTER_TABDIALOG
-#define HID_XML_FILTER_TABPAGE_XSLT
FILTER_HID_XML_FILTER_TABPAGE_XSLT
#define HID_XML_FILTER_NAME
FILTER_HID_XML_FILTER_NAME
#define HID_XML_FILTER_INTERFACE_NAME
FILTER_HID_XML_FILTER_INTERFACE_NAME
#define HID_XML_FILTER_EXTENSION
FILTER_HID_XML_FILTER_EXTENSION
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 509204a..65ed311 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -26,7 +26,6 @@
#include xmlfilterdialogstrings.hrc
#include xmlfiltertabdialog.hxx
#include xmlfiltercommon.hrc
-#include xmlfiltertabpagexslt.hrc
#include xmlfiltertabpagebasic.hxx
#include xmlfiltertabpagexslt.hxx
#include xmlfiltersettingsdialog.hxx
@@ -81,12 +80,12 @@ XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent,
ResMgr rResMgr, const
aCtrlSiz = aSiz;
}
-mpXSLTPage = new XMLFilterTabPageXSLT( maTabCtrl, mrResMgr );
+mpXSLTPage = new XMLFilterTabPageXSLT( maTabCtrl);
mpXSLTPage-SetInfo( mpNewInfo );
maTabCtrl.SetTabPage( RID_XML_FILTER_TABPAGE_XSLT, mpXSLTPage );
-aSiz = mpXSLTPage-GetSizePixel();
+aSiz = mpXSLTPage-GetOptimalSize();
if ( aCtrlSiz.Width() aSiz.Width() || aCtrlSiz.Height() aSiz.Height() )
{
maTabCtrl.SetTabPageSizePixel( aSiz );
@@ -221,7 +220,7 @@ bool XMLFilterTabDialog::onOk()
{
nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
nErrorPage = RID_XML_FILTER_TABPAGE_XSLT;
-pFocusWindow = (mpXSLTPage-maEDExportXSLT);
+pFocusWindow = (mpXSLTPage-m_pEDExportXSLT);
}
}
}
@@ -237,7 +236,7 @@ bool XMLFilterTabDialog::onOk()
{
nErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND;
nErrorPage = RID_XML_FILTER_TABPAGE_XSLT;
-pFocusWindow = (mpXSLTPage-maEDImportTemplate);
+pFocusWindow = (mpXSLTPage-m_pEDImportTemplate);
}
}
}
@@ -247,7 +246,7 @@ bool XMLFilterTabDialog::onOk()
{
nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
nErrorPage = RID_XML_FILTER_TABPAGE_XSLT;
-pFocusWindow = (mpXSLTPage-maEDExportXSLT);
+pFocusWindow =
[Libreoffice-commits] core.git: filter/source filter/uiconfig
filter/source/xsltdialog/xmlfilterhelpids.hrc| 14 -- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx|5 - filter/uiconfig/ui/xmlfiltertabpagetransformation.ui | 10 ++ 3 files changed, 6 insertions(+), 23 deletions(-) New commits: commit cd79c46b46da0a362fbb313d1e47682a85a27f60 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 15:11:08 2013 +0100 drop unused help ids fix mnemonic widgets Change-Id: I80c21126e2728ffa18c87a98e500cc941d462de1 diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index b87c23f..ff6624a 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -19,21 +19,7 @@ #ifndef _XMLFILTERHELPIDS_HRC_ #define _XMLFILTERHELPIDS_HRC_ -#define HID_XML_SOURCE_FILE_DIALOG FILTER_HID_XML_SOURCE_FILE_DIALOG - #define HID_XML_FILTER_TABDIALOG FILTER_HID_XML_FILTER_TABDIALOG -#define HID_XML_FILTER_NAME FILTER_HID_XML_FILTER_NAME -#define HID_XML_FILTER_INTERFACE_NAME FILTER_HID_XML_FILTER_INTERFACE_NAME -#define HID_XML_FILTER_EXTENSION FILTER_HID_XML_FILTER_EXTENSION -#define HID_XML_FILTER_DOCTYPE FILTER_HID_XML_FILTER_DOCTYPE -#define HID_XML_FILTER_NEEDS_XSLT2 FILTER_HID_XML_FILTER_NEEDS_XSLT2 -#define HID_XML_FILTER_EXPORT_XSLT FILTER_HID_XML_FILTER_EXPORT_XSLT -#define HID_XML_FILTER_EXPORT_XSLT_BROWSE FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE -#define HID_XML_FILTER_IMPORT_XSLT FILTER_HID_XML_FILTER_IMPORT_XSLT -#define HID_XML_FILTER_IMPORT_XSLT_BROWSE FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE -#define HID_XML_FILTER_IMPORT_TEMPLATE FILTER_HID_XML_FILTER_IMPORT_TEMPLATE - -#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE #define HID_XML_FILTER_TABPAGE_CTRL FILTER_HID_XML_FILTER_TABPAGE_CTRL diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 1fd2ce1..c32fb36 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -60,11 +60,6 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent) : m_pPBExprotXSLT-SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); m_pPBImportXSLT-SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); m_pPBImportTemplate-SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); - -m_pEDExportXSLT-SetHelpId( HID_XML_FILTER_EXPORT_XSLT ); -m_pEDImportXSLT-SetHelpId( HID_XML_FILTER_IMPORT_XSLT ); -m_pEDImportTemplate-SetHelpId( HID_XML_FILTER_IMPORT_TEMPLATE ); -m_pCBNeedsXSLT2-SetHelpId( HID_XML_FILTER_NEEDS_XSLT2 ); } XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT() diff --git a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui index 6f2ae19..c19a25f 100644 --- a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui +++ b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui @@ -54,6 +54,7 @@ property name=xalign0/property property name=label translatable=yes_XSLT for export/property property name=use_underlineTrue/property +property name=mnemonic_widgetxsltexport/property /object packing property name=left_attach0/property @@ -64,7 +65,7 @@ /child child object class=GtkButton id=browseexport -property name=label translatable=yesbrows_e.../property +property name=label translatable=yesBrows_e.../property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -84,6 +85,7 @@ property name=xalign0/property property name=label translatable=yesXSLT _for import/property property name=use_underlineTrue/property +property name=mnemonic_widgetxsltimport/property /object packing property name=left_attach0/property @@ -94,7 +96,7 @@ /child child object class=GtkButton id=browseimport -property name=label translatable=yesb_rowse.../property +property name=label translatable=yesB_rowse.../property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -112,9 +114,9 @@ property name=visibleTrue/property property
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |1 - source/text/shared/01/06150120.xhp | 23 +++ 2 files changed, 11 insertions(+), 13 deletions(-) New commits: commit 8c5b41a85329a9677733546d16a097860bd28058 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 15:54:15 2013 +0100 update help ids for Xml Filter TabPage Transformation .ui convert Change-Id: I236f18776a1b4dbdd4885f55660130b6fd6a4c45 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 696abb9..9d05cd9 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3907,7 +3907,6 @@ HID_XML_FILTER_IMPORT_XSLT_BROWSE,64074, HID_XML_FILTER_OUTPUT_WINDOW,64089, HID_XML_FILTER_TABDIALOG,64060, HID_XML_FILTER_TABPAGE_CTRL,64091, -HID_XML_FILTER_TABPAGE_XSLT,64062, HID_XML_FILTER_TEST_CLOSE,64086, HID_XML_FILTER_TEST_DIALOG,64076, HID_XML_FILTER_TEST_EXPORT_BROWSE,64077, diff --git a/source/text/shared/01/06150120.xhp b/source/text/shared/01/06150120.xhp index ab3e7a9..d98f537 100644 --- a/source/text/shared/01/06150120.xhp +++ b/source/text/shared/01/06150120.xhp @@ -31,24 +31,23 @@ /history /meta body - - + bookmark branch=hid/filter/ui/xmlfiltertabpagetransformation/XmlFilterTabPageTransformation xml-lang=en-US id=bm_id3148731 localize=false/ paragraph id=hd_id3147477 role=heading level=1 oldref=21 l10n=U xml-lang=en-USvariable id=transformationlink href=text/shared/01/06150120.xhp name=TransformationTransformation/link/variable/paragraph paragraph l10n=U role=paragraph id=par_id3154350 xml-lang=en-US oldref=1ahelp visibility=visible hid=Enter or edit file information for an link href=text/shared/01/0615.xhp name=XML filterXML filter/link./ahelp/paragraph section id=howtoget embed href=text/shared/00/0406.xhp#xmlfilteredit/ /section - bookmark branch=hid/FILTER_HID_XML_FILTER_DOCTYPE xml-lang=en-US id=bm_id3148731 localize=false/paragraph role=heading level=2 id=hd_id3148668 l10n=U xml-lang=en-US oldref=2DocType/paragraph - paragraph l10n=U role=paragraph id=par_id3155934 xml-lang=en-US oldref=3ahelp hid=HID_XML_FILTER_DOCTYPE visibility=visibleEnter the DOCTYPE of the XML file./ahelp/paragraph + bookmark branch=hid/filter/ui/xmlfiltertabpagetransformation/doc xml-lang=en-US id=bm_id3148731 localize=false/paragraph role=heading level=2 id=hd_id3148668 l10n=U xml-lang=en-US oldref=2DocType/paragraph + paragraph l10n=U role=paragraph id=par_id3155934 xml-lang=en-US oldref=3ahelp hid=filter/ui/xmlfiltertabpagetransformation/doc visibility=visibleEnter the DOCTYPE of the XML file./ahelp/paragraph paragraph role=listitem id=par_id3155892 l10n=U xml-lang=en-US oldref=11The public identifier is used to detect the filter when you open a file without specifying a filter./paragraph -bookmark branch=hid/FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE xml-lang=en-US id=bm_id3153749 localize=false/bookmark branch=hid/FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE xml-lang=en-US id=bm_id3157863 localize=false/bookmark branch=hid/FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE xml-lang=en-US id=bm_id3150774 localize=false/paragraph role=heading level=2 id=hd_id3155338 l10n=U xml-lang=en-US oldref=12Browse/paragraph - paragraph l10n=U role=paragraph id=par_id3150506 xml-lang=en-US oldref=13ahelp hid=HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE visibility=visibleOpens a file selection dialog./ahelp/paragraph - bookmark branch=hid/FILTER_HID_XML_FILTER_EXPORT_XSLT xml-lang=en-US id=bm_id3156426 localize=false/paragraph role=heading level=2 id=hd_id3153527 l10n=U xml-lang=en-US oldref=14XSLT for export/paragraph - paragraph l10n=U role=paragraph id=par_id3152552 xml-lang=en-US oldref=15ahelp hid=HID_XML_FILTER_EXPORT_XSLT visibility=visibleIf this is an export filter, enter the file name of the XSLT stylesheet that you want to use for exporting./ahelp/paragraph - bookmark branch=hid/FILTER_HID_XML_FILTER_IMPORT_XSLT xml-lang=en-US id=bm_id3151110 localize=false/paragraph role=heading level=2 id=hd_id3149149 l10n=U xml-lang=en-US oldref=20XSLT for import/paragraph - paragraph l10n=U role=paragraph id=par_id3147653 xml-lang=en-US oldref=16ahelp hid=HID_XML_FILTER_IMPORT_XSLT visibility=visibleIf this is an import filter, enter the file name of the XSLT stylesheet that you want to use for importing./ahelp/paragraph - bookmark branch=hid/FILTER_HID_XML_FILTER_IMPORT_TEMPLATE xml-lang=en-US id=bm_id3155831 localize=false/paragraph role=heading level=2 id=hd_id3147242 l10n=U xml-lang=en-US oldref=17Template for import/paragraph - paragraph l10n=U role=paragraph id=par_id3153320 xml-lang=en-US oldref=18ahelp hid=HID_XML_FILTER_IMPORT_TEMPLATE visibility=visibleEnter the name of the template that you want to use for importing. In the template, styles are defined to display XML tags./ahelp/paragraph +bookmark branch=hid/filter/ui/xmlfiltertabpagetransformation/browseexport xml-lang=en-US id=bm_id3153749 localize=false/bookmark
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9dca925dd94258116781defc534b40bf16ee435a Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 15:54:15 2013 +0100 Updated core Project: help 8c5b41a85329a9677733546d16a097860bd28058 diff --git a/helpcontent2 b/helpcontent2 index e9f0aae..8c5b41a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e9f0aae948acb3c4ad6c1639bc1e08df4aebcd11 +Subproject commit 8c5b41a85329a9677733546d16a097860bd28058 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/count-todo-dialogs
bin/count-todo-dialogs | 24 1 file changed, 24 insertions(+) New commits: commit 8a1f6b6ec39b849a83a5c394635af166a0ff692b Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 16:13:07 2013 +0100 add a utility to estimate how much new .ui files we need Change-Id: I9b2a2ae1e8d74df701b4a2fcf28460759a95d639 diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs new file mode 100755 index 000..fef854d --- /dev/null +++ b/bin/count-todo-dialogs @@ -0,0 +1,24 @@ +#!/bin/sh +# +# This file is part of the LibreOffice project. +# +# 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/. +# +# Run this from the source root dir to count: +# a) the number of .ui files +# b) the estimated amount of additional .ui files required + +converted=`ls */uiconfig/ui/*.ui */uiconfig/*/ui/*.ui|wc -l` +echo $converted .ui files currently exist + +dialogs=`git grep -h Dialog -- *.src|grep -v DialogControl|grep -v HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v Text \[ en-US \]|grep -v HelpId|grep -v Cancel-Button|grep -v \Dialog\|grep -v Dialog Controls |grep -v .uno:|grep -v //|grep -v include|grep -v paste region|grep -v Tabpage-Dialog|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc -l` + +tabpages=`git grep -h TabPage -- *.src|grep -v DialogControl|grep -v HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v Text \[ en-US \]|grep -v HelpId|grep -v Cancel-Button|grep -v \Dialog\|grep -v Dialog Controls |grep -v .uno:|grep -v //|grep -v include|grep -v paste region|grep -v Tabpage-Dialog|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc -l` + +echo There are $dialogs unconverted dialogs +echo There are $tabpages unconverted tabpages + +num=$(($dialogs + $tabpages)) +echo An estimated additional $num .ui are required ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/officeipcthread.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a604a49512d23894b72050d1112b09b2f6f49c96
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jul 30 17:34:38 2013 +0200
Fix a typo and -- hopefully -- tinderbox make check
Change-Id: I3ba939ae97d9d6cd966dc9f0bf3c96d9039d8752
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 9113880..14000eb 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -553,7 +553,7 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
}
}
-else if ( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN,
rSecurity )) // Connection not successfull, now we try to create
+else if ( pThread-maPipe.create( aPipeIdent.getStr(),
osl_Pipe_CREATE, rSecurity )) // Connection not successfull, now we try to
create
{
// Pipe created
nPipeMode = PIPEMODE_CREATED;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx|3 +-
sc/inc/formulacell.hxx |3 +-
sc/inc/rangenam.hxx |7 ++--
sc/inc/refupdatecontext.hxx |9 ++
sc/inc/table.hxx |4 +-
sc/inc/tokenarray.hxx|3 +-
sc/source/core/data/colorscale.cxx |3 +-
sc/source/core/data/column.cxx | 14 -
sc/source/core/data/conditio.cxx |5 ++-
sc/source/core/data/documen2.cxx | 18 +++-
sc/source/core/data/formulacell.cxx |7 +++-
sc/source/core/data/refupdatecontext.cxx |3 ++
sc/source/core/data/table1.cxx | 44 ---
sc/source/core/tool/rangenam.cxx | 29 ++--
sc/source/core/tool/token.cxx| 44 +++
15 files changed, 115 insertions(+), 81 deletions(-)
New commits:
commit 8083253443099269469c7070fd617bef67585e62
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 30 11:45:37 2013 -0400
Adjust named range references on sheet move.
Change-Id: I3b20f79d9c2f373c93a34ccdb308c6d5c09f69e7
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 88b1266..a42ac8f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -50,6 +50,7 @@ namespace sc {
struct RefUpdateContext;
struct RefUpdateInsertTabContext;
struct RefUpdateDeleteTabContext;
+struct RefUpdateMoveTabContext;
}
class Fraction;
@@ -327,7 +328,7 @@ public:
void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
void UpdateInsertTabOnlyCells( sc::RefUpdateInsertTabContext rCxt );
void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt );
-voidUpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
+void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB nTabNo );
voidUpdateCompile( bool bForceIfNameInUse = false );
voidUpdateTranspose( const ScRange rSource, const ScAddress
rDest,
ScDocument* pUndoDoc );
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 28dbde5..1213959 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -35,6 +35,7 @@ class EndListeningContext;
struct RefUpdateContext;
struct RefUpdateInsertTabContext;
struct RefUpdateDeleteTabContext;
+struct RefUpdateMoveTabContext;
}
@@ -214,7 +215,7 @@ public:
void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
voidUpdateInsertTabAbs(SCTAB nTable);
bool UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt );
-voidUpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
+void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB nTabNo );
voidUpdateRenameTab(SCTAB nTable, const OUString rName);
boolTestTabRefAbs(SCTAB nTable);
voidUpdateCompile( bool bForceIfNameInUse = false );
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index d18c0a7..4a56ea1 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -37,6 +37,7 @@ namespace sc {
struct RefUpdateContext;
struct RefUpdateInsertTabContext;
struct RefUpdateDeleteTabContext;
+struct RefUpdateMoveTabContext;
}
typedef sal_uInt16 RangeType;
@@ -75,8 +76,6 @@ private:
void InitCode();
public:
-enum TabRefUpdateMode { Insert = 1, Delete = 2, Move = 3 };
-
typedef ::std::mapsal_uInt16, sal_uInt16 IndexMap;
SC_DLLPUBLICScRangeData( ScDocument* pDoc,
@@ -142,9 +141,9 @@ public:
SC_DLLPUBLIC bool IsValidReference( ScRange rRef ) const;
boolIsRangeAtBlock( const ScRange ) const;
-void UpdateTabRef(SCTAB nOldTable, TabRefUpdateMode eMode, SCTAB
nNewTable, SCTAB nNewSheets);
void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt, SCTAB nLocalTab
= -1 );
void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt, SCTAB nLocalTab
= -1 );
+void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB nLocalTab =
-1 );
voidValidateTabRefs();
@@ -195,7 +194,7 @@ public:
void UpdateReference( sc::RefUpdateContext rCxt, SCTAB nLocalTab = -1 );
void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt, SCTAB nLocalTab
= -1 );
void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt, SCTAB nLocalTab
= -1 );
-void UpdateTabRef(SCTAB nTable, ScRangeData::TabRefUpdateMode eMode, SCTAB
nNewTable = 0, SCTAB nNewSheets = 1);
+void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB nLocalTab =
-1 );
void UpdateTranspose(const ScRange rSource, const ScAddress rDest);
void UpdateGrow(const ScRange rArea, SCCOL nGrowX, SCROW nGrowY);
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 88ef9d2..380bc84 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -101,6
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-0-5'
New branch 'libreoffice-4-0-5' available with the following commits: commit b8d778608a5be455138cbf30ea65b45d2ae941c6 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jul 30 17:45:36 2013 +0200 Branch libreoffice-4-0-5 This is 'libreoffice-4-0-5' - the stable branch for the 4.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I3fa75113e45aea473c4ee0b9114ead96d9f99656 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-0-5'
New branch 'libreoffice-4-0-5' available with the following commits: commit d5a60d11a3d750d2f17b148f21f653696216798c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jul 30 17:45:35 2013 +0200 Branch libreoffice-4-0-5 This is 'libreoffice-4-0-5' - the stable branch for the 4.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ied808aef877042357f764697424670a6784029a8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-0-5'
New branch 'libreoffice-4-0-5' available with the following commits: commit 368c291dc92e1f7006ff4ba798611159d5085443 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jul 30 17:45:36 2013 +0200 Branch libreoffice-4-0-5 This is 'libreoffice-4-0-5' - the stable branch for the 4.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I243b33e0731f6a4773753af86c13a26ebc297dd6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-0-5'
New branch 'libreoffice-4-0-5' available with the following commits: commit c9b047c2ea39bdd6a75c8c575ab21370b2324006 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Jul 30 17:45:38 2013 +0200 Branch libreoffice-4-0-5 This is 'libreoffice-4-0-5' - the stable branch for the 4.0.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8b8c4a8a26906f5ad2eff4777eec9e5a3ba88e91 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/source
sw/source/core/bastyp/init.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 32ce2fc84491847d26576f3af454cb9e86cfc26a
Author: Alex Ivan alexni...@yahoo.com
Date: Tue Jul 30 18:32:05 2013 +0300
Fix missing font attributes in AutoFormat window
The attribute range associated with the SwTableBoxFmt did not
include the necessary ids for character attributes, and as a
result, these were not stored and not used correctly.
The solution should not have any side-effects, but, to be sure
there should be further testing of other features where this
range came into use.
Change-Id: I8cb1ac881b2746ae3ec7958a958167de6f140a7f
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 934c821..148202c 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -209,6 +209,7 @@ sal_uInt16 aTableBoxSetRange[] = {
RES_PROTECT,RES_PROTECT,
RES_VERT_ORIENT,RES_VERT_ORIENT,
RES_FRAMEDIR, RES_FRAMEDIR,
+RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_BOXATR_BEGIN, RES_BOXATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |2 -
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit a4973169d6ad43d0540ab66bae32196d5a295adf
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Tue Jul 30 17:49:18 2013 +0200
bump product version to 4.0.6.0+, reset number to 0
Change-Id: I3a6d5add3937c16b6d0d077d4f5c5fd079ea14aa
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index d65c8f8..e9d726c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.5.0
+UREPACKAGEVERSION 4.0.6.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.5.0
+ABOUTBOXPRODUCTVERSION 4.0.6.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.6.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.5.0
+ABOUTBOXPRODUCTVERSION 4.0.6.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.6.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.6.0
PACKAGEREVISION 1
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.6.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.6.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.6.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .6.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.0.5.1'
Tag 'libreoffice-4.0.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-30 16:55 -0700 Tag libreoffice-4.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR9+IAAAoJEPQ0oe+v7q6jf8YP+QFbyEEu9JpKA9BsVwyfNFbH xzvIBgrh1keFGj0BkXu9quIUBRWIhsfTugWBh45FuUdx7pG4Nipavy6OvMavPU3D TKadWSboVX9Qs9fX7smboNiCO0+HABk/bvyfgVLAFRlNY9505N1Sq/22c2pSx4Lf 97FuJyvQ8ltyEcAluiNfh+RnI4gD0rMZFA0OKGaUPpm6EPaS9k3uIPe7QOP+llxS ht1cBgaHYo249IzGAMtP7POw0MX10R4VdwL1LwTiLCw105MZdIIAF1xgPpQEpA9L Za3QN0AqLJeIVOvqyOyhgBGZnaOOz/dCQCIY+Ylcp7BmsFt/rAZpSA4A19jXNHas 2s9opvgop8QOI8oEZVkdqOJmV7tpNUMSO+rS/l2hp98V0xEjZ5z7edrWgvD2iEmm vdffL3kosxxBZeOa0IV4O9Kkc+DCpBSFK0J5tciLZ11jggQKVdkXmKLn4zR/b1Ks vqY5Ucgx7ecTvdQNHaPnjl6x/fXEnZn1A41B9jrqY8vK+2mnpouTctjHQEgLS34P ttMEcleix70ISgTqfz0GIm87yVkreEwHLqk9TqfBdx3wDp44/K+rPju11CcEPSFf Un7vvPGuxUY4ODXA5591Mm/KvG1q7CMyM8I6cpOHWitdmIFPV6S4Uvsn0mBRc0Jq 03Y5/YFPP5olnwuV9vet =jEiB -END PGP SIGNATURE- Changes since sdremote-1.0.2-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.0.5.1'
Tag 'libreoffice-4.0.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-30 16:55 -0700 Tag libreoffice-4.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR9+H/AAoJEPQ0oe+v7q6jGlYQAI23gu0hRLGl8ZStw94lZw14 XW/81u9pFdxT397g0XsMUylHMiS2cJlMK01ETf0eU0Y0cBAOkcyFTFbKUgDxnLlf oNmoM4oIxCKzq6mOyfag6y1fhvRSRkyCY+vEkgO/iYKOftO+t4OaBg2tiLxApKA7 KwJOk5QCqQ95Y+L5DroZskW5XOxQ6OOmHP/MGJjXjsnQhoPhKgecUO9nyn8wSwEN l83pbkdrtMIp4vdDYGdzMOswmAw4UVzduvAhLfuVnLkrWUZ+PGRxBclWSzVrNIVd MZ0Lqf4QLFhyaDEjdxvWYvLxA5WrkYAEDG42RccTY+aHhjpsMbNokK96ykDO2WzC KF62H3QtCT8pdW9tnCi+PsDACkBFw4d0/+hTKQlBnwJEOJKq0vHvUJFgT8WPqOf5 4odzBMjVGB9APyEPdOzWoqFElAkgW2iQYGQTYg9lbqUdfij1EUlE/BVC5mdEo/Mz rmTSAY0vAggwFZ9usnr3jpApz3IOzq1WvGMfSiWx87ewMfmF0JD6/5C7E6l9AiAR vhUXjQwfqX6CWVPn60rVcyG+zERRQkuSXPpZb3jXqTLZNmfrUBKeGuMCkKMSNCDF BE0EzPbPF4e+9GDDBrmg6YFFXoizmRlCXNGx7gAj6x/m44vUXIlxx/bTiKCbKdnm jkRBT3c7x9StrR6IWoaG =4jhG -END PGP SIGNATURE- Changes since sdremote-1.0.2-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.0.5.1'
Tag 'libreoffice-4.0.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-30 16:55 -0700 Tag libreoffice-4.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR9+H9AAoJEPQ0oe+v7q6jVHYQAIzGhd946hT2GNIMT69krrcI 0h2A5RsdZl+428cJis6hgp5M+BsMEorucvXdKVjt5wY3cUhOZ7bC8Q1F1I9LRQy0 qKYJx6YGTM/PRUc70D76J5c7HKuJ5hYSFCYUJ6Zbo53S9ysE7EY9kcQ+3+iq4m8i bPudy+xi2V1ccL7Ei+317KTySwQZ5NiLf/aQ+zuwgaMa3yUDOKGBk0XVnhO2KqlM aayYDNr5Iou5jbSfiH2Sf3dCDA826J4V2kdu1RAzzYlFmCdXTB/YOL/8mjcuGvDW X0gF5Le0LhZSC6UVgoht0KR/Qk8Ot5B3DY5K145FsXsOZLtoJPr9Bh/VqfPp+To+ wC3PKw4eBCOfSNfyIco9v6JvJsp7vNF8EMurDpj9JibXPcLNTtPjUjeDN0SN3y6z y/EpdJ1H/pEjy1IhalJ2u9ldphHRXLIquO3alFst2sRjtVuDseDj1QsKoO+THiaW XD8JMhNrTLkoN90zG6aiFKVmibfMmv5At6/aBelNeBeVfHolL8tqB8Mze/hoqhMs iE3wxaMasdjA9uhCetrHGhmJsHzTRXgShPqa7kT8xPHDE0oVtcp9KYlxXQTew4s0 bM4NGMF6thc1PBq1HxvpIWPfnNhaMmEtfn+FQuatZ/OhPA0q3kgPvuqolV6J8NW0 aHmY10ySzkNsUV8DC59h =nHGj -END PGP SIGNATURE- Changes since sdremote-1.0.2-17: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 94a15e7f89b3873dd655b41418298db4e4763c65
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Tue Jul 30 17:59:37 2013 +0200
bump product version to 4.0.5.1+, release number to 1
Change-Id: I4a2d42fc7e98ed0c4c68a61404050fa4aae595c3
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index d65c8f8..0b85b5d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.5.0
+UREPACKAGEVERSION 4.0.5.1
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.5.0
+ABOUTBOXPRODUCTVERSION 4.0.5.1
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.5.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.5.0
+ABOUTBOXPRODUCTVERSION 4.0.5.1
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.5.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.5.1
PACKAGEREVISION 1
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.5.1
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.5.1
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.0
+PACKAGEVERSION 4.0.5.1
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.0
+PRODUCTEXTENSION .5.1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-
[Libreoffice-commits] core.git: unotest/source
unotest/source/java/org/openoffice/test/OfficeConnection.java |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 62df5aabcdb3dc99ada137a5fa06707ec671d1fe
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 18:23:23 2013 +0200
gdb-core-bt.sh expects three arguments now
...since 29b59f2e87d1b00ab6a1f4cc4e960603974992bc gdb-core-bt: don't talk
about
core files without a reason.
Change-Id: I45640a5724fd98faf3a7c1e44e904f880cc9fc6a
diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index de6e705..5ecf3b6 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -104,6 +104,7 @@ public final class OfficeConnection {
throws InterruptedException, com.sun.star.uno.Exception
{
boolean cleanTermination = false;
+int code = 0;
try {
boolean desktopTerminated = true;
if (process != null) {
@@ -140,7 +141,6 @@ public final class OfficeConnection {
process.destroy();
}
}
-int code = 0;
if (process != null) {
code = process.waitFor();
}
@@ -165,7 +165,7 @@ public final class OfficeConnection {
ProcessBuilder pb = new ProcessBuilder(
postprocesscommand,
sofficeArg.substring(path:.length()) + .bin,
-workdir);
+workdir, String.valueOf(code));
Process postprocess = pb.start();
Forward ppoutForward = new Forward(
postprocess.getInputStream(), System.out);
@@ -173,7 +173,7 @@ public final class OfficeConnection {
Forward pperrForward = new Forward(
postprocess.getErrorStream(), System.err);
pperrForward.start();
-int code = postprocess.waitFor();
+code = postprocess.waitFor();
if (code != 0) {
throw new PostprocessFailedException(code);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/gdb-core-bt.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eb4a3e95cd02f940c9c794aea89e1e1a12588981
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 30 18:25:08 2013 +0200
Better Shell error messages in case argument is missing
...like before 62df5aabcdb3dc99ada137a5fa06707ec671d1fe gdb-core-bt.sh
expects
three arguments now
Change-Id: I0e75813e36278e53db3fa13a60a58a84e90d7538
diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index 69ce22b..0d21dda 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -27,7 +27,7 @@ then
rm $GDBCOMMANDFILE
echo
exit 0
-elif [ $EXITCODE -ge 128 ]; then
+elif [ $EXITCODE -ge 128 ]; then
echo
echo No core file identified in directory ${COREDIR}
echo To show backtraces for crashes during test execution,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: API change: sheet index from short to long
On Jul 30, 2013 10:41 AM, Kohei Yoshida kohei.yosh...@suse.de wrote: Norbert's thread reminded me of one thing we said we were going to do for 4.0,and turned out we haven't done it yet. That is to switch the type of sheet index from the current short to long, to support the increased number of sheets that we now support in Calc core. Ok. We missed the boat, clearly. But this is something we'll definitely have to do at some point. Any suggestion as to when we should do this? I did not follow up on it as it will also require to change the printing api. The printing api needs to support the same number of pages which requires quite a bit of work. Additionally we are currently memory bound in most cases because even an empty sheet is large enough to make 32bit computers crash with out of memory exceptions for the supported 32000 sheets. So currently I think it is really low priority and we can work on that if we think that there are real use cases. Until then we have limited ourselves anyway to only 1 sheets. Regards Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.0.5.1'
Tag 'libreoffice-4.0.5.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-07-30 16:55 -0700 Tag libreoffice-4.0.5.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR9+IBAAoJEPQ0oe+v7q6jEAEQAJzEbASrpQLs8Bxhrm2z7czv d9/FglHXOd0WwH0l9+/dqDQAVz5HGxLs0q8jw1ENihXwhiuX3T0zxsxVMkKkmovb e4efa60ZwfIdb8B3RpylTgbRugKhlM5CS9Vsd22R2yavLKeKOTFXDRvas89Ejh0G ahFwXA8FqY1q2LHclcYE9zitkWKlWM5goGYwTVPW22B6ZfLL66yoMCowe7PluGHW 34rVkMpki7hh2d+xKrvdKIqMaq11aFkmHj86li0WXetnYOwsHhPpOxlLMRKR0eAG lYRdlspuFrXOd0frMF2LgJJrkCaiB1Awm0oyCUBRv8MwQN19z4zf8zjkyV2ftJwA pn7OYKsnoNzsnpZhhOYytVeFc/eyAdmI2wqhGUGsgTI3KaaWL4/9u7ku6bS3W8oB GNCkd5oZIW6/GvtygTDuKgUyHxk17WhDxtxhAh9jjNNaVewOn68exScjxJ3HkSHi rHk4Kf7wvkb6Pnf7u/kTgTn90b53/MpollyQyPSISFwIahyk/m7eNmWw0MZs19dW 77RQP/D0KYflw5YVdP+bv173EplyAN+ERUEpynoayY9P9MJ5OThWoUrggqo7P8YS shfUYALaQDrUpPwGvdVjUkHSEWwpqnE/v4JeiwX1wfBJrcDufXEDJDSNdHDpfo6P cZZqFPkQjJO5KQu2fKI2 =msfA -END PGP SIGNATURE- Changes since sdremote-1.0.0-790: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/app/salinst.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 918ddde5be4fde7bf8679bdf19805c618deabbf5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jul 30 18:43:53 2013 +0200
Fix MinGW32 and MinGW64 build
SHARDAPPIDINFO is Windows 7+ only. MinGW32/64 headers don't have it.
So, just declare a struct with the same members since the
SHAddToRecentDocs expect LPVOID anyway.
Change-Id: I27e2c8cd6cd7f033cdcf053cc60a1c71038b189a
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 4401bb7..22917e8 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -1055,7 +1055,7 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString rFileUrl, const OUS
{
IShellItem* pShellItem = NULL;
-HRESULT hr = pSHCreateItemFromParsingName (
system_path.getStr(), NULL, IID_PPV_ARGS(pShellItem) );
+HRESULT hr = pSHCreateItemFromParsingName ( (PCWSTR)
system_path.getStr(), NULL, IID_PPV_ARGS(pShellItem) );
if ( SUCCEEDED(hr) pShellItem )
{
@@ -1088,9 +1088,14 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString rFileUrl, const OUS
OUString
sApplicationID(TheDocumentFoundation.LibreOffice.);
sApplicationID += sApplicationName;
-SHARDAPPIDINFO info;
+typedef struct {
+IShellItem *psi;
+PCWSTR pszAppID;
+} DummyShardAppIDInfo;
+
+DummyShardAppIDInfo info;
info.psi = pShellItem;
-info.pszAppID = sApplicationID.getStr();
+info.pszAppID = (PCWSTR) sApplicationID.getStr();
SHAddToRecentDocs ( SHARD_APPIDINFO, info );
return;
@@ -1098,8 +1103,8 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString rFileUrl, const OUS
}
}
}
-// For whatever reason, we could not use the SHARD_APPIDNFO semantics
-SHAddToRecentDocs(SHARD_PATHW, system_path.getStr());
+// For whatever reason, we could not use the SHARD_APPIDINFO semantics
+SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09a4c4d176ff97ab8ff4027af83a549991667baf Author: Tor Lillqvist t...@iki.fi Date: Tue Jul 30 19:05:34 2013 +0300 Odd instability in what Bluetooth headers to include in OS X SDKs Change-Id: Ia8e835373bea3287cf16f3d505dbb420c874fed3 diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index f8843ea..ccdf03f 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -39,7 +39,7 @@ #ifdef MACOSX #include osl/conditn.hxx // Include this early to avoid error as check() gets defined by some SDK header to empty #include premac.h - #if MACOSX_SDK_VERSION = 1070 + #if MACOSX_SDK_VERSION == 1070 || MACOSX_SDK_VERSION == 1080 #import IOBluetooth/IOBluetooth.h #else #import CoreFoundation/CoreFoundation.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Add license to NSAXSpy - Simplified BSD License
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5204 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dev-tools refs/changes/04/5204/1 Add license to NSAXSpy - Simplified BSD License Change-Id: Ie0d9bb13a29001f255d4a8529e22375842a3470a --- M NSAXSpy/NSAXSpy/main.m 1 file changed, 21 insertions(+), 0 deletions(-) diff --git a/NSAXSpy/NSAXSpy/main.m b/NSAXSpy/NSAXSpy/main.m index d504d65..e96ed40 100644 --- a/NSAXSpy/NSAXSpy/main.m +++ b/NSAXSpy/NSAXSpy/main.m @@ -5,6 +5,27 @@ // Created by Boris Dušek on 14.10.12. // Copyright (c) 2012 Boris Dušek. All rights reserved. // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// //This tool currently logs the AXAttributedString of the first AXTextArea //found in LibreOffice (suited for Writer), and logs all AXValueChanged //and AXSelectedTextChanged notifications of that AXTextArea and also all -- To view, visit https://gerrit.libreoffice.org/5204 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0d9bb13a29001f255d4a8529e22375842a3470a Gerrit-PatchSet: 1 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Boris Dušek m...@dusek.me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Add NSAXSpy to help debugging OS X accessibility
Well, now I know what you mean (if you mean NSA and spy), the name can be distilled and was intended as this: NS = NextStep - traditional prefix for system Objective-C classes (NSString, NSObject, NSView etc.) AX = Axessibility = Accessibility (prefix for system accessibility functions the tool uses) Spy = spies (listens to) on accessibility notifications sent by the UI elements That's it. :-) On Jul 30, 2013, at 3:13 PM, Stephan van den Akker stephanv...@gmail.com wrote: Cool, Is this the patch where I can flag any of my colleagues as enemy of the state from within LO so they get a free trip to a nice bay in Cuba? 2013/7/28 Boris Dušek (via Code Review) ger...@gerrit.libreoffice.org Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5160 Approvals: Boris Dušek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5160 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7f4dbed4924b8f5330726d378eda3601991f404 Gerrit-PatchSet: 2 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Boris Dušek m...@dusek.me Gerrit-Reviewer: Boris Dušek m...@dusek.me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: NSAXSpy/NSAXSpy
NSAXSpy/NSAXSpy/main.m | 21 + 1 file changed, 21 insertions(+) New commits: commit c6332b0e1c80e84fa380324e7f2214aa119b5f04 Author: Boris Dušek m...@dusek.me Date: Tue Jul 30 19:55:41 2013 +0200 Add license to NSAXSpy - Simplified BSD License Change-Id: Ie0d9bb13a29001f255d4a8529e22375842a3470a Reviewed-on: https://gerrit.libreoffice.org/5204 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/NSAXSpy/NSAXSpy/main.m b/NSAXSpy/NSAXSpy/main.m index d504d65..e96ed40 100644 --- a/NSAXSpy/NSAXSpy/main.m +++ b/NSAXSpy/NSAXSpy/main.m @@ -5,6 +5,27 @@ // Created by Boris Dušek on 14.10.12. // Copyright (c) 2012 Boris Dušek. All rights reserved. // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// //This tool currently logs the AXAttributedString of the first AXTextArea //found in LibreOffice (suited for Writer), and logs all AXValueChanged //and AXSelectedTextChanged notifications of that AXTextArea and also all ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Add license to NSAXSpy - Simplified BSD License
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5204 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5204 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0d9bb13a29001f255d4a8529e22375842a3470a Gerrit-PatchSet: 2 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Boris Dušek m...@dusek.me Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - connectivity/source
connectivity/source/drivers/firebird/FConnection.cxx|8 +++-
connectivity/source/drivers/firebird/FPreparedStatement.cxx |6 --
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 5226b42560e3965c23973ddaf157477f191fdbbb
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Jul 30 20:35:01 2013 +0200
Ignore authentication for embedded db (firebird-sdbc).
This turns off firebird's internal SQL authentication -- previously
tables were created and/or access validated using the current user's
name leading to issues when a .odb file is shared amongst different
users.
Change-Id: I86615c17c3045aac19d635ee41d76673d1b64530
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx
b/connectivity/source/drivers/firebird/FConnection.cxx
index c81d698..6fb8578 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -207,7 +207,13 @@ void OConnection::construct(const ::rtl::OUString url,
const Sequence Property
*dpb++ = FIREBIRD_SQL_DIALECT;
// Do any more dpbBuffer additions here
-if (!m_bIsEmbedded) // TODO: || m_bIsLocalFile
+if (m_bIsEmbedded) // TODO: || m_bIsLocalFile
+{
+*dpb++ = isc_dpb_trusted_auth;
+*dpb++ = 1; // Length of data
+*dpb++ = 1; // TRUE
+}
+else
{
// TODO: parse password from connection string as needed?
}
commit 470daf5ce02924f31b7cb8a95c921427cfb4d277
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Jul 30 17:05:13 2013 +0200
Add extra error check. (firebird-sdbc)
Change-Id: Id342c01feddb9e0779afdc663ae019ea92a4517d
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx
b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
index 4e05b92..441b86b 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
@@ -128,8 +128,10 @@ void OPreparedStatement::ensurePrepared()
// m_nNumParams = isc_vax_integer(aResultBuffer+3, aVarLength);
// }
// }
-mallocSQLVAR(m_pInSqlda);
-evaluateStatusVector(m_statusVector, m_sSqlStatement, *this);
+if (!aErr)
+mallocSQLVAR(m_pInSqlda);
+else
+evaluateStatusVector(m_statusVector, m_sSqlStatement, *this);
}
OPreparedStatement::~OPreparedStatement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update help ids for direct sql dialog .ui conversion
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5205 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/05/5205/1 update help ids for direct sql dialog .ui conversion Change-Id: I04405deaa3af2deb89d41ea032dc95b0fb5f919f --- M helpers/help_hid.lst M source/text/shared/explorer/database/1108.xhp 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 60fe492..0ffa5cf 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5970,7 +5970,6 @@ dbaccess_ListBox_DLG_DATASOURCE_SELECTION_LB_DATASOURCE,1388383745, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_FREEINDEXES,1388334594, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_TABLEINDEXES,1388334593, -dbaccess_ListBox_DLG_DIRECTSQL_LB_HISTORY,1388678662, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP1,1388416514, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP2,1388416516, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP3,1388416518, @@ -5992,7 +5991,6 @@ dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536, dbaccess_ModalDialog_DLG_DATASOURCE_SELECTION,1388380160, dbaccess_ModalDialog_DLG_DBASE_INDEXES,1388331008, -dbaccess_ModalDialog_DLG_DIRECTSQL,1388675072, dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, @@ -6001,8 +5999,6 @@ dbaccess_ModalDialog_DLG_SQLEXCEPTIONCHAIN,1388363776, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, -dbaccess_MultiLineEdit_DLG_DIRECTSQL_ME_SQL,1388677635, -dbaccess_MultiLineEdit_DLG_DIRECTSQL_ME_STATUS,1388677640, dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426, dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES,851594242, dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES,851594241, @@ -6015,8 +6011,6 @@ dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603, dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_CREATE,1388384777, dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_MANAGE,1388384773, -dbaccess_PushButton_DLG_DIRECTSQL_PB_CLOSE,1388679691, -dbaccess_PushButton_DLG_DIRECTSQL_PB_EXECUTE,1388679684, dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529, dbaccess_PushButton_DLG_JOIN_TABADD_PB_ADDTABLE,2462290433, dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158, diff --git a/source/text/shared/explorer/database/1108.xhp b/source/text/shared/explorer/database/1108.xhp index d84778c..63c9912 100644 --- a/source/text/shared/explorer/database/1108.xhp +++ b/source/text/shared/explorer/database/1108.xhp @@ -41,17 +41,17 @@ embed href=text/shared/guide/data_enter_sql.xhp#data_enter_sql/ paragraph role=paragraph id=par_id3147275 xml-lang=en-US l10n=U oldref=23You can only enter administration commands in this dialog, such as Grant, Create Table, or Drop Table, and not filter commands. The commands that you can enter depend on the data source, for example, dBASE can only run some of the SQL commands list here./paragraph paragraph role=note id=par_id3154860 xml-lang=en-US l10n=U oldref=10To run an SQL query for filtering data in the database, use the link href=text/shared/explorer/database/02010100.xhp name=Query DesignQuery Design View/link./paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL id=bm_id3150772 localize=false/paragraph role=heading id=hd_id3149514 xml-lang=en-US level=2 l10n=U oldref=3Command to execute/paragraph -paragraph role=paragraph id=par_id3147618 xml-lang=en-US l10n=U oldref=4ahelp hid=DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQLEnter the SQL administration command that you want to run./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/dbaccess/ui/directsqldialog/sql id=bm_id3150772 localize=false/paragraph role=heading id=hd_id3149514 xml-lang=en-US level=2 l10n=U oldref=3Command to execute/paragraph +paragraph role=paragraph id=par_id3147618 xml-lang=en-US l10n=U oldref=4ahelp hid=dbaccess/ui/directsqldialog/sqlEnter the SQL administration command that you want to run./ahelp/paragraph paragraph role=paragraph id=par_id3153087 xml-lang=en-US l10n=U oldref=24For example, for a Bibliography data source, you can enter the following SQL command:/paragraph paragraph role=paragraph id=par_id3145673 xml-lang=en-US l10n=U oldref=25SELECT Address FROM biblio biblio/paragraph paragraph role=paragraph id=par_id3145611 xml-lang=en-US l10n=U oldref=21For more information on SQL commands, please consult the documentation that came with the database./paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY id=bm_id3154923 localize=false/paragraph role=heading id=hd_id3156024 xml-lang=en-US level=2 l10n=U oldref=26Previous commands/paragraph -paragraph role=paragraph id=par_id3149045 xml-lang=en-US l10n=U oldref=27ahelp
[Libreoffice-commits] core.git: scripting/source
scripting/source/provider/MasterScriptProvider.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d
Author: Noel Power noel.po...@suse.com
Date: Tue Jul 30 17:29:42 2013 +0100
fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VB
access to libreoffice objects ( and methods/properties of those objects )
from VB all goes through the ole automation bridge. There has been a long
standing issue where the bridge falls over trying to access methods of the
scripting framework MasterScriptProvider object.
Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index a473394..f7dca4d 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -695,7 +695,9 @@ MasterScriptProvider::hasByName( const OUString aName )
throw (RuntimeException
result = xCont-hasByName( aName );
}
-else
+// If this is a document provider then we shouldn't
+// have a PackageProvider
+else if (!m_xModel.is())
{
throw RuntimeException( PackageMasterScriptProvider is
unitialised,
Reference XInterface () );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a078da0841f3e49831653f29696df0b717e674d6 Author: Csikós Tamás csks.t...@gmail.com Date: Tue Jul 30 20:56:31 2013 +0200 Updated core Project: help 49dbfd092b55cab53b632980ad79fd6c24d7c99b update help ids for direct sql dialog .ui conversion Change-Id: I04405deaa3af2deb89d41ea032dc95b0fb5f919f Reviewed-on: https://gerrit.libreoffice.org/5205 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 8c5b41a..49dbfd0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8c5b41a85329a9677733546d16a097860bd28058 +Subproject commit 49dbfd092b55cab53b632980ad79fd6c24d7c99b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/colorscale.hxx| 27 ++-
sc/inc/conditio.hxx | 44 --
sc/inc/refupdatecontext.hxx |2
sc/inc/validat.hxx | 13 +
sc/source/core/data/colorscale.cxx | 125 --
sc/source/core/data/conditio.cxx | 211 ++-
sc/source/core/data/documen2.cxx | 26 +--
sc/source/core/data/documen3.cxx |2
sc/source/core/data/document.cxx | 18 +-
sc/source/core/data/refupdatecontext.cxx | 24 +++
sc/source/core/data/table1.cxx | 16 --
sc/source/core/data/table2.cxx |8 +
sc/source/core/data/validat.cxx | 23 ++-
sc/source/core/tool/token.cxx| 36 +
14 files changed, 324 insertions(+), 251 deletions(-)
New commits:
commit 2f9d3f6ba8facbb2a6eac9a8e13b84fdfc7e8932
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 30 15:27:02 2013 -0400
Rework reference update in conditional formatting and cell validation.
No tests are written for this yet.
Change-Id: Ic26a7f19d6ce6e6d7059035dc9c99ae5bcb9d77b
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index e220426..1264f27 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -69,8 +69,10 @@ public:
formula::FormulaGrammar::Grammar eGrammar =
formula::FormulaGrammar::GRAM_DEFAULT);
void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab, SCTAB nTabNo);
-void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
-const ScRange rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+void UpdateReference( sc::RefUpdateContext rCxt );
+void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
+void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt );
+void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt );
const ScTokenArray* GetFormula() const;
OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const;
@@ -249,9 +251,10 @@ public:
void AddEntry(ScColorScaleEntry* pEntry);
virtual void DataChanged(const ScRange rRange);
-virtual void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab);
-virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
-const ScRange rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+virtual void UpdateReference( sc::RefUpdateContext rCxt );
+virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
+virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt );
+virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt );
virtual bool NeedsRepaint() const;
@@ -279,9 +282,10 @@ public:
const ScDataBarFormatData* GetDataBarData() const;
virtual void DataChanged(const ScRange rRange);
-virtual void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab);
-virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
-const ScRange rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+virtual void UpdateReference( sc::RefUpdateContext rCxt );
+virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
+virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt );
+virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt );
virtual bool NeedsRepaint() const;
@@ -323,9 +327,10 @@ public:
const ScIconSetFormatData* GetIconSetData() const;
virtual void DataChanged(const ScRange rRange);
-virtual void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab);
-virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
-const ScRange rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+virtual void UpdateReference( sc::RefUpdateContext rCxt );
+virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
+virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt );
+virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt );
virtual bool NeedsRepaint() const;
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 42ad1f7..7f50a27 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -40,6 +40,15 @@ class ScFormulaCell;
class ScTokenArray;
struct ScRefCellValue;
+namespace sc {
+
+struct RefUpdateContext;
+struct RefUpdateInsertTabContext;
+struct RefUpdateDeleteTabContext;
+struct RefUpdateMoveTabContext;
+
+}
+
// nOptions Flags
#define SC_COND_NOBLANKS1
@@ -111,9 +120,10 @@ public:
virtual ~ScFormatEntry() {}
virtual condformat::ScFormatEntryType GetType() const = 0;
-virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
-const ScRange rRange, SCsCOL nDx, SCsROW nDy,
SCsTAB nDz ) = 0;
-virtual void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) = 0;
+virtual void UpdateReference( sc::RefUpdateContext rCxt ) = 0;
+virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt ) = 0;
+virtual void UpdateDeleteTab(
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/explorer/database/1108.xhp | 16 2 files changed, 8 insertions(+), 14 deletions(-) New commits: commit 49dbfd092b55cab53b632980ad79fd6c24d7c99b Author: Csikós Tamás csks.t...@gmail.com Date: Tue Jul 30 20:56:31 2013 +0200 update help ids for direct sql dialog .ui conversion Change-Id: I04405deaa3af2deb89d41ea032dc95b0fb5f919f Reviewed-on: https://gerrit.libreoffice.org/5205 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 9d05cd9..618fa40 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5945,7 +5945,6 @@ dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121, dbaccess_ListBox_DLG_DATASOURCE_SELECTION_LB_DATASOURCE,1388383745, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_FREEINDEXES,1388334594, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_TABLEINDEXES,1388334593, -dbaccess_ListBox_DLG_DIRECTSQL_LB_HISTORY,1388678662, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP1,1388416514, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP2,1388416516, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP3,1388416518, @@ -5967,7 +5966,6 @@ dbaccess_MetricField_DLG_ROWHEIGHT_MF_VALUE,1388452353, dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536, dbaccess_ModalDialog_DLG_DATASOURCE_SELECTION,1388380160, dbaccess_ModalDialog_DLG_DBASE_INDEXES,1388331008, -dbaccess_ModalDialog_DLG_DIRECTSQL,1388675072, dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, @@ -5976,8 +5974,6 @@ dbaccess_ModalDialog_DLG_REL_PROPERTIES,1388593152, dbaccess_ModalDialog_DLG_SQLEXCEPTIONCHAIN,1388363776, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, -dbaccess_MultiLineEdit_DLG_DIRECTSQL_ME_SQL,1388677635, -dbaccess_MultiLineEdit_DLG_DIRECTSQL_ME_STATUS,1388677640, dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426, dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES,851594242, dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES,851594241, @@ -5990,8 +5986,6 @@ dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697, dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603, dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_CREATE,1388384777, dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_MANAGE,1388384773, -dbaccess_PushButton_DLG_DIRECTSQL_PB_CLOSE,1388679691, -dbaccess_PushButton_DLG_DIRECTSQL_PB_EXECUTE,1388679684, dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529, dbaccess_PushButton_DLG_JOIN_TABADD_PB_ADDTABLE,2462290433, dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158, diff --git a/source/text/shared/explorer/database/1108.xhp b/source/text/shared/explorer/database/1108.xhp index d84778c..63c9912 100644 --- a/source/text/shared/explorer/database/1108.xhp +++ b/source/text/shared/explorer/database/1108.xhp @@ -41,17 +41,17 @@ embed href=text/shared/guide/data_enter_sql.xhp#data_enter_sql/ paragraph role=paragraph id=par_id3147275 xml-lang=en-US l10n=U oldref=23You can only enter administration commands in this dialog, such as Grant, Create Table, or Drop Table, and not filter commands. The commands that you can enter depend on the data source, for example, dBASE can only run some of the SQL commands list here./paragraph paragraph role=note id=par_id3154860 xml-lang=en-US l10n=U oldref=10To run an SQL query for filtering data in the database, use the link href=text/shared/explorer/database/02010100.xhp name=Query DesignQuery Design View/link./paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL id=bm_id3150772 localize=false/paragraph role=heading id=hd_id3149514 xml-lang=en-US level=2 l10n=U oldref=3Command to execute/paragraph -paragraph role=paragraph id=par_id3147618 xml-lang=en-US l10n=U oldref=4ahelp hid=DBACCESS_MULTILINEEDIT_DLG_DIRECTSQL_ME_SQLEnter the SQL administration command that you want to run./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/dbaccess/ui/directsqldialog/sql id=bm_id3150772 localize=false/paragraph role=heading id=hd_id3149514 xml-lang=en-US level=2 l10n=U oldref=3Command to execute/paragraph +paragraph role=paragraph id=par_id3147618 xml-lang=en-US l10n=U oldref=4ahelp hid=dbaccess/ui/directsqldialog/sqlEnter the SQL administration command that you want to run./ahelp/paragraph paragraph role=paragraph id=par_id3153087 xml-lang=en-US l10n=U oldref=24For example, for a Bibliography data source, you can enter the following SQL command:/paragraph paragraph role=paragraph id=par_id3145673 xml-lang=en-US l10n=U oldref=25SELECT Address FROM biblio biblio/paragraph paragraph role=paragraph id=par_id3145611 xml-lang=en-US l10n=U oldref=21For more information
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8fa9fb87eeae0706c1cf90e20baaf8255e3c099d Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 20:28:58 2013 +0100 Updated core Project: help 35792431d1fb897b52e1815390f6a1bb988f5696 diff --git a/helpcontent2 b/helpcontent2 index 49dbfd0..3579243 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 49dbfd092b55cab53b632980ad79fd6c24d7c99b +Subproject commit 35792431d1fb897b52e1815390f6a1bb988f5696 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/1108.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 35792431d1fb897b52e1815390f6a1bb988f5696 Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 30 20:28:58 2013 +0100 add a help id for toplevel dialog Change-Id: Id0f05977218425cc2f86bf068636f6c4c97639b1 diff --git a/source/text/shared/explorer/database/1108.xhp b/source/text/shared/explorer/database/1108.xhp index 63c9912..4b12fe6 100644 --- a/source/text/shared/explorer/database/1108.xhp +++ b/source/text/shared/explorer/database/1108.xhp @@ -31,7 +31,7 @@ body bookmark xml-lang=en-US branch=index id=bm_id3148983bookmark_valueSQL; executing SQL statements (Base)/bookmark_value bookmark_valuedatabases; administration through SQL (Base)/bookmark_value -/bookmarkcommentmw added (Base) to all entries/commentparagraph role=paragraph id=par_id3148983 xml-lang=en-US l10n=E oldref=22 localize=false/ +/bookmarkbookmark xml-lang=en-US branch=hid/dbaccess/ui/directsqldialog/DirectSQLDialog id=bm_id3150773 localize=false/paragraph role=paragraph id=par_id3148983 xml-lang=en-US l10n=E oldref=22 localize=false/ paragraph role=heading id=hd_id3153345 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/explorer/database/1108.xhp name=Execute SQL statementExecute SQL statement/link/paragraph paragraph role=paragraph id=par_id3154288 xml-lang=en-US l10n=CHG oldref=2variable id=sqltextahelp hid=.Opens a dialog where you can enter an SQL command for administering a database./ahelp /variable/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] update help ids for direct sql dialog .ui conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5205 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5205 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04405deaa3af2deb89d41ea032dc95b0fb5f919f Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós csks.t...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - scripting/source
scripting/source/provider/MasterScriptProvider.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 860dae597f24e519f78b0e74e0c371daea37a156
Author: Noel Power noel.po...@suse.com
Date: Tue Jul 30 17:29:42 2013 +0100
fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VB
access to libreoffice objects ( and methods/properties of those objects )
from VB all goes through the ole automation bridge. There has been a long
standing issue where the bridge falls over trying to access methods of the
scripting framework MasterScriptProvider object.
Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index 32c89b4..afe5957 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -696,7 +696,9 @@ MasterScriptProvider::hasByName( const OUString aName )
throw (RuntimeException
result = xCont-hasByName( aName );
}
-else
+// If this is a document provider then we shouldn't
+// have a PackageProvider
+else if (!m_xModel.is())
{
throw RuntimeException( PackageMasterScriptProvider is
unitialised,
Reference XInterface () );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/compiler.hxx |5
sc/source/core/inc/refupdat.hxx | 26 --
sc/source/core/tool/compiler.cxx | 134 ---
sc/source/core/tool/refupdat.cxx | 347 ---
4 files changed, 512 deletions(-)
New commits:
commit badf6557902067afc074f81bdf02c49fde02c045
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 30 15:47:51 2013 -0400
These methods are now unused. Chuck them.
Change-Id: Ib9b0ad855142434e45bcb4d805fc32e7c76b01b8
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 9ecb893..46606d8 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -441,11 +441,6 @@ public:
static void MoveRelWrap( ScTokenArray rArr, ScDocument* pDoc, const
ScAddress rPos,
SCCOL nMaxCol, SCROW nMaxRow );
-void UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScAddress rOldPos, const ScRange,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
- bool rChanged, bool rRefSizeChanged );
-
/** If the character is allowed as first character in sheet names or
references, includes '$' and '?'. */
static inline bool IsCharWordChar( String const rStr,
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 8252005..099b173 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -58,32 +58,6 @@ public:
sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz,
ScBigRange rWhat );
-/**
- * Update range reference in response to row / column insertion / removal,
- * copy-n-pasting of formula cell, moving of cells etc.
- *
- * @param pDoc
- * @param eUpdateRefMode
- * @param rPos position of formula cell that has the range reference.
- * @param rRange range of cells being shifted.
- * @param nDx
- * @param nDy
- * @param nDz
- * @param rRef range reference object
- * @param eWhat
- *
- * @return ScRefUpdateRes
- */
-static ScRefUpdateRes Update(
-ScDocument* pDoc, UpdateRefMode eUpdateRefMode, const ScAddress rPos,
-const ScRange rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-ScComplexRefData rRef, ScRange rRefRange, WhatType eWhat = ALL );
-
-/// Before calling, the absolute references must be up-to-date!
-static ScRefUpdateRes Move(
-ScDocument* pDoc, const ScAddress rPos, SCsCOL nDx, SCsROW nDy,
SCsTAB nDz,
-ScComplexRefData rRef, ScRange rRefRange, bool bWrap, bool bAbsolute
);
-
static void MoveRelWrap( ScDocument* pDoc, const ScAddress rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData
rRef );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ed60c30..55668cc 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4137,140 +4137,6 @@ void ScCompiler::MoveRelWrap( ScTokenArray rArr,
ScDocument* pDoc, const ScAddr
}
}
-void ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
- const ScAddress rOldPos, const ScRange r,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
- bool rChanged, bool rRefSizeChanged )
-{
-rChanged = rRefSizeChanged = false;
-if ( eUpdateRefMode == URM_COPY )
-{ // Normally nothing has to be done here since RelRefs are used, also
-// SharedFormulas don't need any special handling, except if they
-// wrapped around sheet borders.
-// But ColRowName tokens pointing to a ColRow header which was
-// copied along with this formula need to be updated to point to the
-// copied header instead of the old position's new intersection.
-ScToken* t;
-pArr-Reset();
-while( (t = static_castScToken*(pArr-GetNextColRowName())) != NULL )
-{
-ScSingleRefData rRef = t-GetSingleRef();
-ScAddress aNewRef = rRef.toAbs(rOldPos);
-aNewRef.IncCol(nDx);
-aNewRef.IncRow(nDy);
-aNewRef.IncTab(nDz);
-if ( r.In( aNewRef ) )
-{
-SingleDoubleRefModifier aMod(rRef);
-ScComplexRefData rRef2 = aMod.Ref();
-ScRange aRefRange = rRef2.toAbs(rOldPos);
-// yes, this is URM_MOVE
-if (ScRefUpdate::Update(pDoc, URM_MOVE, aPos, r, nDx, nDy,
nDz, rRef2, aRefRange) != UR_NOTHING)
-{
-rRef2.SetRange(aRefRange, rOldPos);
-rChanged = true;
-}
-}
-}
-
-return;
-}
-
-ScToken* t;
-pArr-Reset();
-while( (t = static_castScToken*(pArr-GetNextReferenceOrName())) != NULL
)
-{
-if (t-GetType() == svIndex)
-
[Libreoffice-commits] core.git: 2 commits - filter/AllLangResTarget_xsltdlg.mk filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk vcl/source
filter/AllLangResTarget_xsltdlg.mk |1
filter/UIConfig_xsltdlg.mk |1
filter/source/xsltdialog/xmlfiltercommon.hrc | 32 -
filter/source/xsltdialog/xmlfilterdialogstrings.hrc |2
filter/source/xsltdialog/xmlfilterhelpids.hrc| 28
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |1
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 77
filter/source/xsltdialog/xmlfiltertabdialog.hxx | 13 --
filter/source/xsltdialog/xmlfiltertabdialog.src | 49 ---
filter/source/xsltdialog/xmlfiltertabpagebasic.cxx |1
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx|1
filter/uiconfig/ui/xsltfilterdialog.ui | 118 +++
vcl/source/window/tabdlg.cxx |2
13 files changed, 153 insertions(+), 173 deletions(-)
New commits:
commit 35449264c6b34a3f40d5c831351b8e3594f77e61
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 30 21:00:39 2013 +0100
start weeding out TabDialog::AdjustLayout
Change-Id: I905aa0364b6be0871f34aa0dc466f99fb5c44dfc
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index cedf2ea..c0b4d9e 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -261,6 +261,8 @@ void TabDialog::StateChanged( StateChangedType nType )
void TabDialog::AdjustLayout()
{
+SAL_WARN_IF(isLayoutEnabled(), vcl.layout, unnecessary to call
TabDialog::AdjustLayout when layout enabled);
+
ImplPosControls();
queue_resize();
}
commit 8bcbc765a2764a85add4be25ab9d4789f43bb640
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 30 20:47:54 2013 +0100
convert xslt filter dialog to .ui
Change-Id: I02bb629af1f4811f382469b8e2aaaba272f07034
diff --git a/filter/AllLangResTarget_xsltdlg.mk
b/filter/AllLangResTarget_xsltdlg.mk
index 316d0a2..34262e2 100644
--- a/filter/AllLangResTarget_xsltdlg.mk
+++ b/filter/AllLangResTarget_xsltdlg.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\
))
$(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\
- filter/source/xsltdialog/xmlfiltertabdialog.src \
filter/source/xsltdialog/xmlfilterdialogstrings.src \
))
diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index a54c4e8..6b7b48f 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\
filter/uiconfig/ui/xmlfiltersettings \
filter/uiconfig/ui/xmlfiltertabpagegeneral \
filter/uiconfig/ui/xmlfiltertabpagetransformation \
+ filter/uiconfig/ui/xsltfilterdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hrc
b/filter/source/xsltdialog/xmlfiltercommon.hrc
deleted file mode 100644
index 9081799..000
--- a/filter/source/xsltdialog/xmlfiltercommon.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _XMLFILTERCOMMON_HRC_
-#define _XMLFILTERCOMMON_HRC_
-
-#include filter.hrc
-
-#define DLG_XML_SOURCE_FILE_DIALOG (RID_XSLT_DIALOG_START+0)
-#define DLG_XML_FILTER_TABDIALOG(RID_XSLT_DIALOG_START+1)
-#define RID_XML_FILTER_TABPAGE_BASIC(RID_XSLT_DIALOG_START+2)
-#define RID_XML_FILTER_TABPAGE_XSLT (RID_XSLT_DIALOG_START+3)
-#define DLG_XML_FILTER_TEST_DIALOG (RID_XSLT_DIALOG_START+4)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
index fa7c152..8eb7516 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
@@ -20,7 +20,7 @@
#ifndef _XMLFILTERDIALOGSTRINGS_HRC_
#define _XMLFILTERDIALOGSTRINGS_HRC_
-#include xmlfiltercommon.hrc
+#include filter.hrc
#define STR_COLUMN_HEADER_NAME (RID_XSLT_DIALOG_START + 0)
#define STR_COLUMN_HEADER_TYPE (RID_XSLT_DIALOG_START + 1)
diff --git
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|64753 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||64753 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/conditio.cxx | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
New commits:
commit eea9c45b74c2980d76154a3755ba8f037401efbd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 30 16:12:53 2013 -0400
More on avoiding direct access to reference data members.
Change-Id: I313c6504d7c0beeb68318ce436b48fa900e4cf48
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 591fc0f..c0939ff 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1429,22 +1429,24 @@ ScAddress ScConditionEntry::GetValidSrcPos() const
while ( ( t = static_castScToken*(pFormula-GetNextReference())
) != NULL )
{
ScSingleRefData rRef1 = t-GetSingleRef();
-if ( rRef1.IsTabRel() !rRef1.IsTabDeleted() )
+ScAddress aAbs = rRef1.toAbs(aSrcPos);
+if (!rRef1.IsTabDeleted())
{
-if ( rRef1.nTab nMinTab )
-nMinTab = rRef1.nTab;
-if ( rRef1.nTab nMaxTab )
-nMaxTab = rRef1.nTab;
+if (aAbs.Tab() nMinTab)
+nMinTab = aAbs.Tab();
+if (aAbs.Tab() nMaxTab)
+nMaxTab = aAbs.Tab();
}
if ( t-GetType() == svDoubleRef )
{
ScSingleRefData rRef2 = t-GetDoubleRef().Ref2;
-if ( rRef2.IsTabRel() !rRef2.IsTabDeleted() )
+aAbs = rRef2.toAbs(aSrcPos);
+if (!rRef2.IsTabDeleted())
{
-if ( rRef2.nTab nMinTab )
-nMinTab = rRef2.nTab;
-if ( rRef2.nTab nMaxTab )
-nMaxTab = rRef2.nTab;
+if (aAbs.Tab() nMinTab)
+nMinTab = aAbs.Tab();
+if (aAbs.Tab() nMaxTab)
+nMaxTab = aAbs.Tab();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|56048 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||56048 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|37960 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||37960 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|33791 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||33791 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|44725 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||44725 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||66864 --- Comment #60 from Cor Nouws c...@nouenoff.nl --- Adding Bug 66864 - By using full screen applications and then restore them, the toolbar disappears in normal view -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - android/sdremote
android/sdremote/AndroidManifest.xml
| 18 +++--
android/sdremote/res/drawable/background_pager_slide.xml
| 17 -
android/sdremote/res/layout/fragment_slides_pager.xml
|2
android/sdremote/res/layout/view_grid_slide.xml
|1
android/sdremote/res/layout/view_pager_slide.xml
|1
android/sdremote/res/values/dimens.xml
|5 -
android/sdremote/res/values/strings.xml
|5 +
android/sdremote/res/values/themes.xml
|4 -
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
| 16 ++---
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
| 19 ++
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
| 12 +++
android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java
|5 -
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
| 31 ++
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
|2
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
| 22 +--
android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
| 10 +++
android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
| 10 +++
17 files changed, 111 insertions(+), 69 deletions(-)
New commits:
commit c12137a876dd9405b20c094c99b72c672a161422
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Tue Jul 30 22:46:03 2013 +0300
Add changing local slide when remote slide was changed.
Change-Id: If7325a0266484686549a0c1073827613aa40cb85
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
index adbc74b..3092503 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
@@ -27,7 +27,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextSwitcher;
-import android.widget.TextView;
import android.widget.ViewAnimator;
import com.actionbarsherlock.app.SherlockFragment;
@@ -74,9 +73,10 @@ public class SlidesPagerFragment extends SherlockFragment
implements ServiceConn
ViewPager aSlidesPager = getSlidesPager();
aSlidesPager.setAdapter(buildSlidesAdapter());
-
aSlidesPager.setCurrentItem(mCommunicationService.getSlideShow().getCurrentSlideIndex());
aSlidesPager.setPageMargin(getSlidesMarginInPx());
aSlidesPager.setOnPageChangeListener(this);
+
+setUpCurrentSlide();
}
private ViewPager getSlidesPager() {
@@ -97,6 +97,12 @@ public class SlidesPagerFragment extends SherlockFragment
implements ServiceConn
return (int) TypedValue.applyDimension(aPxUnit, aSlideMarginInDp,
aDisplayMetrics);
}
+private void setUpCurrentSlide() {
+SlideShow aSlideShow = mCommunicationService.getSlideShow();
+
+getSlidesPager().setCurrentItem(aSlideShow.getCurrentSlideIndex());
+}
+
@Override
public void onPageSelected(int aPosition) {
mCommunicationService.getTransmitter().setCurrentSlide(aPosition);
@@ -172,16 +178,21 @@ public class SlidesPagerFragment extends SherlockFragment
implements ServiceConn
}
private static final class IntentsReceiver extends BroadcastReceiver {
-private final SlidesPagerFragment mSlidesGridFragment;
+private final SlidesPagerFragment mSlidesPagerFragment;
private IntentsReceiver(SlidesPagerFragment aSlidesGridFragment) {
-mSlidesGridFragment = aSlidesGridFragment;
+mSlidesPagerFragment = aSlidesGridFragment;
}
@Override
public void onReceive(Context aContext, Intent aIntent) {
if (Intents.Actions.SLIDE_PREVIEW.equals(aIntent.getAction())) {
-mSlidesGridFragment.refreshSlidesPager();
+mSlidesPagerFragment.refreshSlidesPager();
+return;
+}
+
+if (Intents.Actions.SLIDE_CHANGED.equals(aIntent.getAction())) {
+mSlidesPagerFragment.setUpCurrentSlide();
}
}
}
@@ -189,6 +200,7 @@ public class SlidesPagerFragment extends SherlockFragment
implements ServiceConn
private IntentFilter
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||65686 --- Comment #61 from Cor Nouws c...@nouenoff.nl --- Adding Bug 65686 - EDITING Data Validity broken (for list entries at least) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
