[Libreoffice-commits] .: 2 commits - basic/source comphelper/inc
basic/source/app/textedit.cxx |7 ---
comphelper/inc/comphelper/container.hxx | 24 +---
2 files changed, 17 insertions(+), 14 deletions(-)
New commits:
commit d952f91d1b37cab3f634aa29a5ee84f96d4f47bd
Author: Lionel Elie Mamane
Date: Sun Dec 4 08:19:40 2011 +0100
Review translation by Mike Whiteley
diff --git a/comphelper/inc/comphelper/container.hxx
b/comphelper/inc/comphelper/container.hxx
index c64b531..53b0c31 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.hxx
@@ -41,7 +41,7 @@ namespace comphelper
//
//= IndexAccessIterator
//
-/** ein Iterator, der von einem XIndexAccess ausgehend alle Elemente
durchiteriert (pre-order)
+/** an iterator that iterates through all elements, starting from an
XIndexAccess (pre-order)
*/
class COMPHELPER_DLLPUBLIC IndexAccessIterator
{
@@ -49,13 +49,12 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
m_xStartingPoint;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
m_xCurrentObject;
-// The actual object
+// The current object
::std::vectorm_arrChildIndizies;
-// Actually, as I move through this tree, there are elements but NO
-// GetNextSibling, so I have to remember where each child
-// is in relation to it's parent. This is the path from the
-// root node to m_xCurrentObject
+// I'm moving through a tree, but its elements have no GetNextSibling,
+// so I have to remember where each child is in relation to its parent.
+// That is the path from the root node to m_xCurrentObject
::rtl::OUString m_ustrProperty;
// The Name of the requested property
@@ -72,11 +71,11 @@ public:
protected:
virtual sal_Bool ShouldHandleElement(const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>&
/*rElement*/) { return sal_True; }
-// So we can exclude certain elements, which are expected
-// if this returns sal_True. If so, this element will be returned,
-// which also allows us to return additional information.
+// This can be used to exclude certain elements; elements for which
+// this function returns sal_True will be simply skipped.
+// If this element is returned from Next(), then one can get
+// here get a little more information on the element.
// That's why this method is not const.
-
virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface>& /*xContainer*/) const { return sal_True; }
};
commit 9f8d1f6b46d7a6be51e46bdde935a1c804baf228
Author: Mike Whiteley
Date: Thu Dec 1 19:13:20 2011 -0800
translated some comments from German to English
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index ad66db9..9bdbf8c 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -384,11 +384,12 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG
)
else
pTextEngine->SetUpdateMode( sal_True ); // ! With VDev
-// SetUpdateMode( sal_True ) soll kein Modify setzen
+// SetUpdateMode (sal_True ) shouldn't set Modify
pTextEngine->SetModified( bWasModified );
-// SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
-// => gute Gelegenheit, Textbreite zu ermitteln!
+// SyntaxTimerHdl will be called when the text changes
+// => Good opportunity to get the text width
+
bHighlightning = sal_False;
if ( aSyntaxLineTable.First() )
diff --git a/comphelper/inc/comphelper/container.hxx
b/comphelper/inc/comphelper/container.hxx
index f0466fe..c64b531 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.hxx
@@ -49,15 +49,16 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
m_xStartingPoint;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
m_xCurrentObject;
-// das aktuelle Objekt
+// The actual object
::std::vectorm_arrChildIndizies;
-// ich bewege mich eigentlich durch einen Baum, dummerweise haben
dessen
-// Elemente aber kein GetNextSibling, also muss ich mir merken, wo die
Childs
-// innerhalb ihres Parents sitzen (das ist sozusagen der Pfad von der
Wurzel
-// zu m_xCurrentObject
+
+// Actually, as I move through this tree, there are elements but NO
+// GetNextSibling, so I have to remember where each child
+// is in relation to it's parent. This is the path from the
+// root node to m_xCurrentObject
::rtl::OUString m_ustrProperty;
-// der Name der gesuchten property
+
[Libreoffice-commits] .: sfx2/source
sfx2/source/view/viewfrm.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 2561e3f7860e79817658e536b91192cedaa4aab7
Author: August Sodora
Date: Sat Dec 3 19:53:47 2011 -0500
Revert "fdo#41865: Make macro recording work without experimental features"
This reverts commit f4b3bd91ca177101d90f522e81163dc6421e14c9.
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index a158f53..36b1e3e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3037,6 +3037,14 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
case SID_RECORDMACRO :
{
SvtMiscOptions aMiscOptions;
+const char* pName =
GetObjectShell()->GetFactory().GetShortName();
+if ( !aMiscOptions.IsExperimentalMode() ||
+ ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
+{
+rSet.DisableItem( nWhich );
+rSet.Put(SfxVisibilityItem(nWhich, sal_False));
+break;
+}
::rtl::OUString
sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > xSet(
@@ -3055,6 +3063,13 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
case SID_STOP_RECORDING :
{
SvtMiscOptions aMiscOptions;
+const char* pName =
GetObjectShell()->GetFactory().GetShortName();
+if ( !aMiscOptions.IsExperimentalMode() ||
+ ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
+{
+rSet.DisableItem( nWhich );
+break;
+}
::rtl::OUString
sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > xSet(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/view/viewfrm.cxx | 15 ---
1 file changed, 15 deletions(-)
New commits:
commit f4b3bd91ca177101d90f522e81163dc6421e14c9
Author: August Sodora
Date: Sat Dec 3 18:24:06 2011 -0500
fdo#41865: Make macro recording work without experimental features
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 36b1e3e..a158f53 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3037,14 +3037,6 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
case SID_RECORDMACRO :
{
SvtMiscOptions aMiscOptions;
-const char* pName =
GetObjectShell()->GetFactory().GetShortName();
-if ( !aMiscOptions.IsExperimentalMode() ||
- ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
-{
-rSet.DisableItem( nWhich );
-rSet.Put(SfxVisibilityItem(nWhich, sal_False));
-break;
-}
::rtl::OUString
sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > xSet(
@@ -3063,13 +3055,6 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
case SID_STOP_RECORDING :
{
SvtMiscOptions aMiscOptions;
-const char* pName =
GetObjectShell()->GetFactory().GetShortName();
-if ( !aMiscOptions.IsExperimentalMode() ||
- ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
-{
-rSet.DisableItem( nWhich );
-break;
-}
::rtl::OUString
sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > xSet(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: swext/mediawiki
swext/mediawiki/help/wikiaccount.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0ad98aed91062281bfe96a1c579560e72f3bbe8 Author: Lior Kaplan Date: Sat Dec 3 21:59:26 2011 +0200 Add link to tools - options dialog diff --git a/swext/mediawiki/help/wikiaccount.xhp b/swext/mediawiki/help/wikiaccount.xhp index b27ea09..228a0f9 100644 --- a/swext/mediawiki/help/wikiaccount.xhp +++ b/swext/mediawiki/help/wikiaccount.xhp @@ -51,6 +51,6 @@ Enable to store your password between sessions. The master password must be enabled, see Tools - Options - %PRODUCTNAME - Security. Enter the Internet address of a Wiki server in a format like http://wiki.documentfoundation.org or copy the URL from a web browser. If the Wiki allows anonymous access, you can leave the account text boxes empty. Else enter your user name and password. -If you have enabled the master password feature on the Security tab page of the Tools - Options - %PRODUCTNAME dialog, then the software can store your password and automatically insert the data where necessary. Enable the "Save password" checkbox to store your password. +If you have enabled the master password feature on the Security tab page of the Tools - Options - %PRODUCTNAME dialog, then the software can store your password and automatically insert the data where necessary. Enable the "Save password" checkbox to store your password. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - sc/inc sc/qa sc/source
sc/inc/undorangename.hxx |2
sc/qa/unit/ucalc.cxx | 14 +++--
sc/source/filter/xml/xmlcelli.cxx | 66 +++
sc/source/ui/inc/namedefdlg.hxx |6 ++
sc/source/ui/inc/namedlg.hxx |7 ++
sc/source/ui/inc/namemgrtable.hxx |1
sc/source/ui/inc/tabvwsh.hxx | 12
sc/source/ui/namedlg/namedefdlg.cxx | 26 +-
sc/source/ui/namedlg/namedlg.cxx | 54 +-
sc/source/ui/namedlg/namemgrtable.cxx | 12
sc/source/ui/undo/undorangename.cxx |2
sc/source/ui/view/tabvwsh4.cxx|3 -
sc/source/ui/view/tabvwshc.cxx| 83 +-
13 files changed, 245 insertions(+), 43 deletions(-)
New commits:
commit 3e3f729cd668aa241345166f1046a8f0dd9ac83b
Author: Markus Mohrhard
Date: Sat Dec 3 19:58:27 2011 +0100
correctly select new entry after returning from Define Names
diff --git a/sc/source/ui/inc/namemgrtable.hxx
b/sc/source/ui/inc/namemgrtable.hxx
index bbbcab6..69bc102 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -83,6 +83,7 @@ public:
void addEntry( const ScRangeNameLine& rLine );
void DeleteSelectedEntries();
+void SetEntry( const ScRangeNameLine& rLine );
void GetCurrentLine(ScRangeNameLine& rLine);
bool IsMultiSelection();
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 93456b5..a3a2714 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -364,7 +364,13 @@ bool ScNameDlg::AddPushed()
void ScNameDlg::SetEntry(const rtl::OUString& rName, const rtl::OUString&
rScope)
{
if (!rName.isEmpty())
+{
mbDataChanged = true;
+ScRangeNameLine aLine;
+aLine.aName = rName;
+aLine.aScope = rScope;
+mpRangeManagerTable->SetEntry(aLine);
+}
}
void ScNameDlg::RemovePushed()
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index 40bd5aa..99b1ea0 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -209,6 +209,18 @@ std::vector
ScRangeManagerTable::GetSelectedEntries()
return aSelectedEntries;
}
+void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
+{
+for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+{
+if (rLine.aName == rtl::OUString(GetEntryText(pEntry, 0))
+&& rLine.aScope == rtl::OUString(GetEntryText(pEntry, 2)))
+{
+SetCurEntry(pEntry);
+}
+}
+}
+
namespace {
//ensure that the minimum column size is respected
commit 62ec7f9e824ed1c17f01beaf8f4cec3b76b3aae9
Author: Laurent Godard
Date: Fri Dec 2 12:28:40 2011 +0100
cells creation : do not use uno calls at loading time
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index e16a262..8fd3de4 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1078,16 +1078,66 @@ void ScXMLTableRowCellContext::EndElement()
if (!bIsMatrix)
{
LockSolarMutex();
-ScCellObj* pCellObj =
-
static_cast(ScCellRangesBase::getImplementation(
-xCell));
-if (pCellObj)
+
+ScAddress aScAddress;
+ScUnoConversion::FillScAddress( aScAddress,
aCellPos );
+
+ScDocument* pDoc = rXMLImport.GetDocument();
+
+rtl::OUString aText = pOUFormula->first;
+rtl::OUString aFormulaNmsp = pOUFormula->second;
+
+
::boost::scoped_ptr pExtRefGuard;
+pExtRefGuard.reset(new
ScExternalRefManager::ApiGuard(pDoc));
+
+ScBaseCell* pNewCell = NULL;
+
+if ( !aText.isEmpty() )
{
-pCellObj->SetFormulaWithGrammar(
pOUFormula->first, pOUFormula->second, eGrammar);
-if (bFormulaTextResult && pOUTextValue &&
pOUTextValue->getLength())
-pCellObj->SetFormulaResultString(
*pOUTextValue);
+if ( aText[0] == '=' && aText.getLength() > 1 )
+{
+// temporary formula string as string
tokens
+ScTokenArray* pCode = new ScTokenArray;
+pCode->AddStringXML( aText );
+if( (eGrammar ==
formula::FormulaGrammar::GRAM_EXTERNAL) && (aFormulaNmsp.getLength() > 0) )
+
[Libreoffice-commits] .: sfx2/source
sfx2/source/dialog/filedlghelper.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit eca5888eaaf3aa254b0e888ba328656e1d699a4d
Author: Norbert Thiebaud
Date: Sat Dec 3 10:42:17 2011 -0600
WaE : missing return value on one code path
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 96cb966..141b389 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -856,7 +856,7 @@ static bool lcl_isSystemFilePicker( const uno::Reference<
XFilePicker >& _rxFP )
return false;
}
-enum open_or_save_t {OPEN, SAVE};
+enum open_or_save_t {OPEN, SAVE, UNDEFINED};
static open_or_save_t lcl_OpenOrSave(sal_Int16 const nDialogType)
{
switch (nDialogType)
@@ -877,6 +877,7 @@ static open_or_save_t lcl_OpenOrSave(sal_Int16 const
nDialogType)
default:
assert(false); // invalid dialog type
}
+return UNDEFINED;
}
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/bug
bug/bug/test.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0cae07f8d74b1c14967accee729c8af3cd256f5a
Author: Korrawit Pruegsanusak
Date: Sat Dec 3 16:44:24 2011 +0700
Also make the test successful after fixing create-account-link
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 0f3ef00..93daea0 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -115,7 +115,7 @@ test("state_signin", function() {
$.bug.state_component = function() { ok(true, 'state_component'); };
$.bug.state_signin();
equal($('.login-link').attr('href'), '/');
-equal($('.create-account-link').attr('href'), '/enter_bug.cgi');
+equal($('.create-account-link').attr('href'), '/createaccount.cgi');
equal($('.signin').css('display'), 'block');
// fail to login, shows error
equal($('.error-container').css('display'), 'none', 'no error');
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |1 + 1 file changed, 1 insertion(+) New commits: commit 6a60f07de36ac4448b99185143553028fc26ce59 Author: Lionel Elie Mamane Date: Sat Dec 3 10:28:59 2011 +0100 add postgresql download diff --git a/ooo.lst.in b/ooo.lst.in index 991bca5..c7b9b6e 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -52,6 +52,7 @@ fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz +061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in postgresql/makefile.mk
configure.in |2 +-
postgresql/makefile.mk | 12
2 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit c9c31ee37c75d02a8f66f68df88b60394d80cae9
Author: Lionel Elie Mamane
Date: Sat Dec 3 09:33:21 2011 +0100
postgresql: do not make headers we do not need
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 457894e..6d474e1 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -64,9 +64,10 @@ BUILD_ACTION = \
--bindir=/usr/lib/postgresql/$(MAJOR_VER)/bin \
--libdir=/usr/lib/ \
--includedir=/usr/include/postgresql/ \
-&& make -C src/backend ../../src/include/utils/errcodes.h
../../src/include/utils/fmgroids.h \
-&& make -C src/include DESTDIR="../../../../../" install \
-&& make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) -C
src/interfaces/libpq DESTDIR="../../../../../../" install
+&& DESTDIR="$(SRC_ROOT)/$(PRJNAME)/$(INPATH)/" \
+&& export DESTDIR \
+&& make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) -C
src/interfaces/libpq install \
+&& ./config/install-sh -c -m 644 src/include/postgres_ext.h
"$${{DESTDIR}}/usr/include/postgresql/"
# --- Targets --
commit a33aaa4ba0452adb2943912dd356ea746d286a6e
Author: Lionel Elie Mamane
Date: Sat Dec 3 09:01:48 2011 +0100
Oups... set_soeven does not like literal "@" in values
diff --git a/configure.in b/configure.in
index 890ec7b..5b2a01c 100644
--- a/configure.in
+++ b/configure.in
@@ -5429,7 +5429,7 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes" -a
"x$enable_extension_integrati
SYSTEM_POSTGRESQL=NO
AC_MSG_RESULT([internal])
POSTGRESQL_LIB=""
-POSTGRESQL_INC="@@OVERRIDE_ME@@"
+POSTGRESQL_INC="%OVERRIDE_ME%"
BUILD_TYPE="$BUILD_TYPE POSTGRESQL"
fi
fi
commit 0cac9d5238eff7197a93d543daa55a84fa204d78
Author: Lionel Elie Mamane
Date: Sat Dec 3 08:57:40 2011 +0100
remove n/a comments (came from a copy/paste)
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index c47721b..457894e 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -42,11 +42,6 @@ MAJOR_VER=9.1
TARFILE_NAME=$(EXT_PROJECT_NAME)
TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
-
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate
patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql
library
.IF "$(SYSTEM_POSTGRESQL)" == "YES"
@all:
@echo "Using system postgresql..."
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
