[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - store/Library_store.mk store/source store/workben
store/Library_store.mk|2 ++
store/source/storbase.hxx | 21 -
store/source/storbios.cxx |5 -
store/source/storcach.cxx |7 +--
store/source/stordata.hxx |9 ++---
store/source/stortree.hxx |5 -
store/workben/t_page.cxx |5 -
7 files changed, 29 insertions(+), 25 deletions(-)
New commits:
commit 3a7a2012e16a3f5bcb9be42c4e3a78718216c862
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Mar 9 12:49:26 2013 +0100
WaE: Use BOOST_STATIC_ASSERT
(cherry picked from commit e4b99f5d445903e1309c301cc327d2dfb23d8d71)
Change-Id: Ib9dc2541c3bf72ddd6094331297a91352138e5af
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/store/Library_store.mk b/store/Library_store.mk
index f66c1eb..11c822e 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_Library_Library,store))
$(eval $(call
gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store.map))
+$(eval $(call gb_Library_use_external,store,boost_headers))
+
$(eval $(call gb_Library_use_packages,store,\
store_inc \
))
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 7c07dba..cbd4fc5 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -20,6 +20,9 @@
#ifndef _STORE_STORBASE_HXX_
#define _STORE_STORBASE_HXX_
+#include sal/config.h
+
+#include boost/static_assert.hpp
#include sal/types.h
#include rtl/alloc.h
@@ -49,22 +52,6 @@
#define STORE_IMPL_CONCAT2(x, y) x##y
#endif
-#ifndef STORE_STATIC_ASSERT /* Compile time assertion */
-namespace store
-{
-template bool x struct STATIC_ASSERTION_FAILURE;
-template struct STATIC_ASSERTION_FAILURE true { enum { value = 1 }; };
-
-template int x struct static_assert_test{};
-} // namespace store
-
-#define STORE_STATIC_ASSERT(pred) \
-typedef \
-store::static_assert_test sizeof( store::STATIC_ASSERTION_FAILURE
(bool)(pred) ) \
-STORE_IMPL_CONCAT(static_assert_typedef_, __LINE__)
-
-#endif /* !STORE_STATIC_ASSERT */
-
namespace store
{
@@ -437,7 +424,7 @@ struct PageData
*/
static const size_t theSize = sizeof(G) + sizeof(D) + 2 *
sizeof(L);
static const sal_uInt16 thePageSize = theSize;
-STORE_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE = thePageSize);
+BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE = thePageSize);
/** location.
*/
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index 2cdbece..b773c5d 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include boost/static_assert.hpp
#include storbios.hxx
@@ -182,7 +185,7 @@ struct SuperBlockPage
*/
static const size_t theSize = 2 * SuperBlock::theSize;
static const sal_uInt16 thePageSize = theSize;
-STORE_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE = thePageSize);
+BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE = thePageSize);
/** Allocation.
*/
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index e07aa7f..481177e 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include boost/static_assert.hpp
#include storcach.hxx
@@ -256,7 +259,7 @@ class PageCache_Impl :
/** Representation.
*/
static size_t const theTableSize = 32;
-STORE_STATIC_ASSERT(STORE_IMPL_ISP2(theTableSize));
+BOOST_STATIC_ASSERT(STORE_IMPL_ISP2(theTableSize));
Entry ** m_hash_table;
Entry * m_hash_table_0[theTableSize];
@@ -330,7 +333,7 @@ PageCache_Impl::PageCache_Impl (sal_uInt16 nPageSize)
m_nMissed (0)
{
static size_t const theSize = SAL_N_ELEMENTS(m_hash_table_0);
-STORE_STATIC_ASSERT(theSize == theTableSize);
+BOOST_STATIC_ASSERT(theSize == theTableSize);
memset(m_hash_table_0, 0, sizeof(m_hash_table_0));
}
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index cbd0044..88f8f74 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -20,6 +20,9 @@
#ifndef _STORE_STORDATA_HXX_
#define _STORE_STORDATA_HXX_
+#include sal/config.h
+
+#include boost/static_assert.hpp
#include sal/types.h
#include sal/macros.h
@@ -55,7 +58,7 @@ struct OStoreDataPageData : public store::OStorePageData
*/
static const size_t theSize = 0;
static const sal_uInt16 thePageSize = base::theSize + self::theSize;
-STORE_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE = self::thePageSize);
+BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE = self::thePageSize);
/** capacity.
*/
@@ -145,7 +148,7 @@ struct OStoreIndirectionPageData : public
store::OStorePageData
*/
static const size_t theSize = sizeof(G);
static const
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/cellfml.hxx| 44 ++---
sw/source/core/fields/cellfml.cxx | 124 +++---
2 files changed, 84 insertions(+), 84 deletions(-)
New commits:
commit fa78b33a10ceb46b11caa726512a0862b9775b56
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Tue Aug 13 08:23:15 2013 +0200
Use stardard prefixes for data members, and english names
Change-Id: Ie2c6a12787a1a3753c7b4f82a2b5d342e60fc8da
Reviewed-on: https://gerrit.libreoffice.org/5383
Reviewed-by: Matteo Casalin matteo.casa...@yahoo.com
Tested-by: Matteo Casalin matteo.casa...@yahoo.com
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 0938375..35896a4 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -56,7 +56,7 @@ public:
class SwTableFormula
{
-typedef void (SwTableFormula:: *FnScanFormel)( const SwTable, String,
+typedef void (SwTableFormula:: *FnScanFormula)( const SwTable, String,
String, String*, void* ) const;
void BoxNmsToPtr( const SwTable, String, String, String* = 0,
@@ -80,7 +80,7 @@ typedef void (SwTableFormula:: *FnScanFormel)( const
SwTable, String,
void GetBoxes( const SwTableBox rStt, const SwTableBox rEnd,
SwSelBoxes rBoxes ) const;
-String ScanString( FnScanFormel fnFormel, const SwTable rTbl,
+String ScanString( FnScanFormula fnFormula, const SwTable rTbl,
void* = 0 ) const;
const SwTable* FindTable( SwDoc rDoc, const OUString rNm ) const;
@@ -88,9 +88,9 @@ typedef void (SwTableFormula:: *FnScanFormel)( const
SwTable, String,
protected:
enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME };
-String sFormel;/// current formula
-NameTypeeNmType;/// current display method
-boolbValidValue;/// true: recalculate formula
+String m_sFormula; /// current formula
+NameTypem_eNmType; /// current display method
+boolm_bValidValue; /// true: recalculate formula
// find the node in which the formula is located
// TextFeld- TextNode,
@@ -98,7 +98,7 @@ protected:
// !!! has to be overloaded by every derivation !!!
virtual const SwNode* GetNodeOfFormula() const = 0;
-SwTableFormula( const String rFormel );
+SwTableFormula( const String rFormula );
String MakeFormula( SwTblCalcPara rCalcPara ) const
{
@@ -113,12 +113,12 @@ public:
SwTableFormula( const SwTableFormula rCpy ){ *this = rCpy; }
virtual ~SwTableFormula();
SwTableFormula operator=( const SwTableFormula rCpy )
-{
-sFormel = rCpy.sFormel;
-eNmType = rCpy.eNmType;
-bValidValue = rCpy.bValidValue;
-return *this;
-}
+{
+m_sFormula = rCpy.m_sFormula;
+m_eNmType = rCpy.m_eNmType;
+m_bValidValue = rCpy.m_bValidValue;
+return *this;
+}
/// create from the internal formula (for CORE) the external formula (for
UI)
void PtrToBoxNm( const SwTable* pTbl );
@@ -129,19 +129,19 @@ public:
/// gets called before/after merging/splitting of tables
void ToSplitMergeBoxNm( SwTableFmlUpdate rTblUpd );
-bool IsIntrnlName() const { return eNmType ==
INTRNL_NAME; }
-NameType GetNameType() const{ return eNmType; }
+bool IsIntrnlName() const { return m_eNmType == INTRNL_NAME;
}
+NameType GetNameType() const{ return m_eNmType; }
-bool IsValid() const { return
bValidValue; }
-inline voidChgValid( bool bNew ) { bValidValue = bNew; }
+bool IsValid() const{ return m_bValidValue; }
+void ChgValid( bool bNew ) { m_bValidValue = bNew; }
-const String GetFormula() const{ return sFormel; }
+const String GetFormula() const{ return m_sFormula; }
void SetFormula( const String rNew )
-{
-sFormel = rNew;
-bValidValue = false;
-eNmType = EXTRNL_NAME;
-}
+{
+m_sFormula = rNew;
+m_eNmType = EXTRNL_NAME;
+m_bValidValue = false;
+}
void GetBoxesOfFormula(const SwTable rTbl, SwSelBoxes rBoxes);
// are all boxes valid which this formula relies on?
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index c27664a..fbe3412 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -40,8 +40,8 @@
#include ndindex.hxx
#include comphelper/string.hxx
-const sal_Unicode cRelTrenner = ',';
-const sal_Unicode cRelKennung = '';// CTRL-R
+const sal_Unicode cRelSeparator = ',';
+const sal_Unicode cRelIdentifier = ''; // CTRL-R
const
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/dialog/simptabl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 622c7e764241300e678a6f92ac862df08a61
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 12 11:00:50 2013 +0100
Resolves: fdo#67944 set dialogcontrol bit to tab into simpletable
(cherry picked from commit ae035a32737a77be75c9d017f7f5a90a05048e06)
Conflicts:
svtools/source/contnr/simptabl.cxx
Change-Id: I1ea653d5546961096a9368b4d1d9a1dd39a80745
Reviewed-on: https://gerrit.libreoffice.org/5366
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 46f308d..ec54618 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -44,7 +44,7 @@ SvxSimpleTableContainer::SvxSimpleTableContainer(Window*
pParent, WinBits nBits)
extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
makeSvxSimpleTableContainer(Window *pParent,
VclBuilder::stringmap )
{
-return new SvxSimpleTableContainer(pParent);
+return new SvxSimpleTableContainer(pParent, WB_TABSTOP | WB_DIALOGCONTROL
| WB_BORDER);
}
void SvxSimpleTableContainer::SetTable(SvxSimpleTable* pTable)
___
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' - reportbuilder/java
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 76408b0f0d7e91cddb8b056069a2ee547109b156
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 17:49:53 2013 +0200
fdo#67930 work around fdo#68024
don't emit string-value attribute
Change-Id: I3668b88437451523f2b6bb3c2c82e1929f7ba3d8
Reviewed-on: https://gerrit.libreoffice.org/5371
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Miklos Vajna vmik...@suse.cz
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index d4c86c6..074ae96 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -171,7 +171,8 @@ public class FormatValueUtility
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, string);
}
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
+// work around fdo#68024
+//variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
}
else
{
___
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' - svl/source
svl/source/undo/undo.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2dbff02d9de9d2211a1c000663f3d6f2566d195a
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 12 23:48:45 2013 +0200
fdo#66071: SfxUndoManager: allow Writer to set modified status properly
If Undo actions are removed due to max undo limit, invalidate the
current empty mark so it is different from sw::UndoManager::m_UndoSaveMark.
Change-Id: I20415f42a77b67e9935c75b12df675ba1c5ef5ec
(cherry picked from commit 1ff7dfa533b473d721c372ae801a46ecd513b32f)
Reviewed-on: https://gerrit.libreoffice.org/5379
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 72929b7..d745751 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -648,6 +648,8 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify(
SfxUndoAction *pAction, bool bT
{
--m_pData-pActUndoArray-nCurUndoAction;
}
+// fdo#66071 invalidate the current empty mark when removing
+--m_pData-mnEmptyMark;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Branch Management
Joel Madero wrote: I think the wiki just needs a bit of clarification for noobs using multiple branches like me as the instructions don't warn about things like double submitting changes if you commit multiple changes from different branches. Hi Joel, which wiki page had the misleading or insufficient info? Note that since you commit locally, git log -p will always show you the change that _actually_ went in. And assuming you're on the master branch, 'git log -p origin/master..HEAD' will also show you what new commits would go out, would you git push. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column3.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit c083d68d1670b88ad3a88b768859c7bb1c5e5fee
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 13 09:50:13 2013 +0200
Unused memeber
Change-Id: Iaa3ab3d73270f0a1441eb64854f47088967ca0d5
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c4276d9..9282cf3 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -529,7 +529,6 @@ class EmptyCells
{
ScColumn mrColumn;
sc::ColumnBlockPosition mrPos;
-sc::CellStoreType::iterator miPos;
void splitFormulaGrouping(const sc::CellStoreType::position_type rPos)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c625772a6fed6f67d62c140de06798f6ecb4a9a8
Author: Tor Lillqvist t...@iki.fi
Date: Tue Aug 13 10:50:54 2013 +0300
Avoid warning: rtl_uString_newFromLiteral - Found char 127
Using a literal string that includes non-ASCII character(s) to initialise an
OUString causes a warning sal/rtl/strtmpl.cxx:1338:
rtl_uString_newFromLiteral - Found char 127.
I doubt the '\xFF' in the aWordDelimiters initialiser makes sense. The
initialiser contained \0xFF since the beginning of time, which (as said in
e7a958441a19a4e14bf12aac09fa566de0f263ee) means a zero byte '\0' followed by
xFF.
So '\xFF' was not included in the initialiser during all that time
either. Whatever the '\xFF' means in the set of word delimiters, quite
possibly it is handled explicitly in the code anyway (grep for
CH_FEATURE_OLD).
Change-Id: I2998a13e6e573f85c92e66ff6edbb6354ba11b5b
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 4c1a72a..dc71b16 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -83,7 +83,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool*
pItemPool ) :
aMinAutoPaperSize( 0x0, 0x0 ),
aMaxAutoPaperSize( 0x7FFF, 0x7FFF ),
aEditDoc( pItemPool ),
-aWordDelimiters( .,;:-'`'?!_=\{}()[]\xFF),
+aWordDelimiters( .,;:-'`'?!_=\{}()[]),
bKernAsianPunctuation(false),
bAddExtLeading(false),
bIsFormatting(false),
commit 3440201b75bddd88d02127983995ac4db823bc98
Author: Tor Lillqvist t...@iki.fi
Date: Tue Aug 13 10:49:39 2013 +0300
Remove duplicated space in aWordDelimiters initialiser
Change-Id: Idf191ab3dfa7f6fde190c55d4d1d228a49ecf771
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 89c0908..4c1a72a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -83,7 +83,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool*
pItemPool ) :
aMinAutoPaperSize( 0x0, 0x0 ),
aMaxAutoPaperSize( 0x7FFF, 0x7FFF ),
aEditDoc( pItemPool ),
-aWordDelimiters( .,;:-'`'?!_=\{}()[]\xFF),
+aWordDelimiters( .,;:-'`'?!_=\{}()[]\xFF),
bKernAsianPunctuation(false),
bAddExtLeading(false),
bIsFormatting(false),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - offapi/com
offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d29fb1f9e0ec97d7036d10fd10e91d6253f2b1a Author: Herbert Dürr h...@apache.org Date: Tue Aug 13 07:27:54 2013 + #i123018# fix autodoc comment in XMutableGridDataModel.idl diff --git a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl index b31b3c6..83c5767 100644 --- a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl @@ -120,7 +120,7 @@ published interface XMutableGridDataModel : XGridDataModel /** updates the content of a given row. pThe change in the data model will be notified to registered listeners via -memberXGridDataListener::dataChanged/member. The memberGridDataEvent::FirstColumn/member and +memberXGridDataListener::dataChanged/member. The memberGridDataEvent::FirstColumn/member and memberGridDataEvent::LastColumn/member will denote the smallest respectively largest column index from argColumnIndexes/arg./p ___ 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 0e67b165d513bddbdbc20b59d9db0530486b1342 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 08:49:59 2013 +0100 Updated core Project: help 9104e0686170abf9db588748dada24a395dc145f diff --git a/helpcontent2 b/helpcontent2 index b142c61..9104e06 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b142c61cd4c7afc1a2acdf9463c2771fbeba2378 +Subproject commit 9104e0686170abf9db588748dada24a395dc145f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 19 -- source/text/shared/01/01010303.xhp | 32 +++ source/text/shared/optionen/01010100.xhp | 22 ++--- 3 files changed, 27 insertions(+), 46 deletions(-) New commits: commit 9104e0686170abf9db588748dada24a395dc145f Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 08:49:59 2013 +0100 update help ids for private user data .ui conversion Change-Id: I67ad86d0a2e2cb1d43bc70fc7673b4adbcb497e6 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7fa037c..68d135e 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3821,7 +3821,6 @@ HID_TPSHADOW_CTRL,33990, HID_TPSIZE_CTRL,33993, HID_TP_BUSINESS_DATA,53248, HID_TP_CUSTOMPROPERTIES,33392, -HID_TP_PRIVATE_DATA,53247, HID_TP_TOX_ENTRY,53240, HID_TP_TOX_SELECT,53239, HID_TRANS_ANGLE,33780, @@ -7611,24 +7610,6 @@ sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975, sw_Edit_TP_OPTCAPTION_PAGE_EDT_TEXT,878938130, sw_Edit_TP_OPTCAPTION_PAGE_ED_NUM_SEP,878938147, sw_Edit_TP_OPTCAPTION_PAGE_ED_SEPARATOR,878938137, -sw_Edit_TP_PRIVATE_DATA_ED_CITY,879216679, -sw_Edit_TP_PRIVATE_DATA_ED_COUNTRY,879216681, -sw_Edit_TP_PRIVATE_DATA_ED_FAX,879216689, -sw_Edit_TP_PRIVATE_DATA_ED_FIRSTNAME,879216672, -sw_Edit_TP_PRIVATE_DATA_ED_FIRSTNAME_2,879216706, -sw_Edit_TP_PRIVATE_DATA_ED_MAIL,879216692, -sw_Edit_TP_PRIVATE_DATA_ED_MOBILE,879216687, -sw_Edit_TP_PRIVATE_DATA_ED_NAME,879216673, -sw_Edit_TP_PRIVATE_DATA_ED_NAME_2,879216707, -sw_Edit_TP_PRIVATE_DATA_ED_PHONE,879216686, -sw_Edit_TP_PRIVATE_DATA_ED_PROFESSION,879216683, -sw_Edit_TP_PRIVATE_DATA_ED_SHORTCUT,879216674, -sw_Edit_TP_PRIVATE_DATA_ED_SHORTCUT_2,879216708, -sw_Edit_TP_PRIVATE_DATA_ED_STATE,879216693, -sw_Edit_TP_PRIVATE_DATA_ED_STREET,879216676, -sw_Edit_TP_PRIVATE_DATA_ED_TITLE,879216684, -sw_Edit_TP_PRIVATE_DATA_ED_WWW,879216691, -sw_Edit_TP_PRIVATE_DATA_ED_ZIP,879216678, sw_Edit_TP_TOX_SELECT_ED_TITLE,879134735, sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800, sw_FT_BODY_DLG_MM_MAILBODY,1435402240, diff --git a/source/text/shared/01/01010303.xhp b/source/text/shared/01/01010303.xhp index 5b67175..a38117a 100644 --- a/source/text/shared/01/01010303.xhp +++ b/source/text/shared/01/01010303.xhp @@ -38,25 +38,25 @@ paragraph role=heading id=hd_id3159201 xml-lang=en-US level=2 l10n=U oldref=3Private data/paragraph paragraph role=paragraph id=par_id3147399 xml-lang=en-US l10n=U oldref=4Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing emphswitchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - $[officename] - User Data/emph./paragraph embed href=text/shared/optionen/01010100.xhp#datena/ -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2 id=bm_id3145314 localize=false/paragraph role=heading id=hd_id3156427 xml-lang=en-US level=3 l10n=U oldref=15First name 2/paragraph -paragraph role=paragraph id=par_id3149750 xml-lang=en-US l10n=U oldref=16ahelp hid=SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2Enter the first name of the person, whom you want to use as a second contact./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_PRIVATE_DATA:ED_NAME_2 id=bm_id3155941 localize=false/paragraph role=heading id=hd_id3145345 xml-lang=en-US level=3 l10n=U oldref=17Last name 2/paragraph -paragraph role=paragraph id=par_id3154288 xml-lang=en-US l10n=U oldref=18ahelp hid=SW:EDIT:TP_PRIVATE_DATA:ED_NAME_2Enter the last name of the person, whom you want to use as a second contact./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2 id=bm_id3153663 localize=false/paragraph role=heading id=hd_id3150774 xml-lang=en-US level=3 l10n=U oldref=19Initials 2/paragraph -paragraph role=paragraph id=par_id3151110 xml-lang=en-US l10n=U oldref=20ahelp hid=SW:EDIT:TP_PRIVATE_DATA:ED_SHORTCUT_2Enter the initials of the person, whom you want to use as a second contact./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/privateuserpage/firstname2 id=bm_id3145314 localize=false/paragraph role=heading id=hd_id3156427 xml-lang=en-US level=3 l10n=U oldref=15First name 2/paragraph +paragraph role=paragraph id=par_id3149750 xml-lang=en-US l10n=U oldref=16ahelp hid=modules/swriter/ui/privateuserpage/firstname2Enter the first name of the person, whom you want to use as a second contact./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/privateuserpage/lastname2 id=bm_id3155941 localize=false/paragraph role=heading id=hd_id3145345 xml-lang=en-US level=3 l10n=U oldref=17Last name 2/paragraph +paragraph role=paragraph id=par_id3154288 xml-lang=en-US l10n=U oldref=18ahelp hid=modules/swriter/ui/privateuserpage/lastname2Enter the last name of the person, whom you want to use as a second
Re: matching VCL to touch screen coordinates
Still, this is relevant mainly to zoom (the 2 nd part of my question) What about the scroll? What determines its granularity, and what would be the best way to increase its precision, from the current approx 4 - 8 pixels click, to a 1 pixel click? To clarify, currently, the scroller gets scroll commands on the pixel level, but it won't cause VCL to redraw, until approx 4 - 8 screen pixels have been crossed. What could be causing this scaling in rendering coordinates? Thanks again Ptyl On Monday, August 12, 2013, Ptyl Dragon wrote: Ah, integer fractions - i thought it meant percents, but it means a representation of rational numbers, through the use of two integers. Ok. This info may indeed solve this. Thanks! On Monday, August 12, 2013, Thorsten Behrens wrote: Ptyl Dragon wrote: We cannot express the difference between 1023 and 1024, in units of 1%, as 1% of 1024 is 10.24. So the scale is not sufficient, and even if we fixed it for iPad, tomorrow there might be a touch device with twice the resolution. Hi Ptyl, yes, sure. But vcl itself uses integer fractions to express scaling (check the MapMode class there), as such it should be able to convey the necessary information. Thus the question for code to look at - I seem to miss the point. ;) Cheers, -- Thorsten -- [image: appicon.png] *Ptyl Dragon* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog -- [image: appicon.png] *Ptyl Dragon* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 04/ea4cfabd0af3e2ff30b3ceec41494f47e37db3
04/ea4cfabd0af3e2ff30b3ceec41494f47e37db3 |1 + 1 file changed, 1 insertion(+) New commits: commit da357eeb370b528e504aec9b656380d03287e5b7 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 09:40:02 2013 +0100 Notes added by 'git notes add' diff --git a/04/ea4cfabd0af3e2ff30b3ceec41494f47e37db3 b/04/ea4cfabd0af3e2ff30b3ceec41494f47e37db3 new file mode 100644 index 000..ffd5a92 --- /dev/null +++ b/04/ea4cfabd0af3e2ff30b3ceec41494f47e37db3 @@ -0,0 +1 @@ +prefer: 92da6de0c5da28f98806c39e5c521b2d680bd92c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0d/29fb1f9e0ec97d7036d10fd10e91d6253f2b1a
0d/29fb1f9e0ec97d7036d10fd10e91d6253f2b1a |1 + 1 file changed, 1 insertion(+) New commits: commit 3edb64d6254c5cf5da8261cac82966021222fdd5 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 09:41:42 2013 +0100 Notes added by 'git notes add' diff --git a/0d/29fb1f9e0ec97d7036d10fd10e91d6253f2b1a b/0d/29fb1f9e0ec97d7036d10fd10e91d6253f2b1a new file mode 100644 index 000..68717b3 --- /dev/null +++ b/0d/29fb1f9e0ec97d7036d10fd10e91d6253f2b1a @@ -0,0 +1 @@ +prefer: 3122600a5e11309b86e33061defd710cf0872975 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: matching VCL to touch screen coordinates
Ptyl Dragon wrote: Still, this is relevant mainly to zoom (the 2 nd part of my question) What about the scroll? What determines its granularity, and what would be the best way to increase its precision, from the current approx 4 - 8 pixels click, to a 1 pixel click? Does that come from the scrollbar, or are you calling Writer methods directly? Again, being able to look at code would make this easier. ;) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa writerfilter/Library_writerfilter.mk writerfilter/source
oox/source/vml/vmlshape.cxx |2
sw/qa/extras/rtfimport/data/groupshape-rotation.rtf | 75
sw/qa/extras/rtfimport/rtfimport.cxx| 10 ++
writerfilter/Library_writerfilter.mk|1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 +++
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3
writerfilter/source/rtftok/rtfsdrimport.cxx | 20 +++--
writerfilter/source/rtftok/rtfsdrimport.hxx |2
8 files changed, 118 insertions(+), 8 deletions(-)
New commits:
commit 774b6899172b2f803898655103d6653ef2261cfd
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 13 10:26:00 2013 +0200
RTF import: handle rotation on groupshapes
Change-Id: I7892224a118b6566e26b3ffc472c88f3c7f58620
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e1df8e6..0c88d3f 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -493,7 +493,7 @@ void lcl_SetAnchorType(PropertySet rPropSet, const
ShapeTypeModel rTypeModel)
void lcl_SetRotation(PropertySet rPropSet, const sal_Int32 nRotation)
{
// See DffPropertyReader::Fix16ToAngle(): in VML, positive rotation angles
are clockwise, we have them as counter-clockwise.
-// Additionally, VML type is 0..360, our is 0.36000.
+// Additionally, VML type is 0..360, our is 0..36000.
rPropSet.setAnyProperty(PROP_RotateAngle,
makeAny(sal_Int32(NormAngle360(nRotation * -100;
}
diff --git a/sw/qa/extras/rtfimport/data/groupshape-rotation.rtf
b/sw/qa/extras/rtfimport/data/groupshape-rotation.rtf
new file mode 100644
index 000..bf6b1fb
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/groupshape-rotation.rtf
@@ -0,0 +1,75 @@
+{\rtf1
+{\shpgrp
+{\*\shpinst\shpleft1853\shptop-442\shpright2648\shpbottom1943\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplid1028
+{\sp
+{\sn groupLeft}
+{\sv 2475}
+}
+{\sp
+{\sn groupTop}
+{\sv 1770}
+}
+{\sp
+{\sn groupRight}
+{\sv 4860}
+}
+{\sp
+{\sn groupBottom}
+{\sv 2565}
+}
+{\sp
+{\sn rotation}
+{\sv 2949120}
+}
+{\shp
+{\*\shpinst\shplid1026
+{\sp
+{\sn relLeft}
+{\sv 2475}
+}
+{\sp
+{\sn relTop}
+{\sv 1770}
+}
+{\sp
+{\sn relRight}
+{\sv 3285}
+}
+{\sp
+{\sn relBottom}
+{\sv 2565}
+}
+{\sp
+{\sn shapeType}
+{\sv 2}
+}
+}
+}
+{\shp
+{\*\shpinst\shplid1027
+{\sp
+{\sn relLeft}
+{\sv 3900}
+}
+{\sp
+{\sn relTop}
+{\sv 1770}
+}
+{\sp
+{\sn relRight}
+{\sv 4860}
+}
+{\sp
+{\sn relBottom}
+{\sv 2565}
+}
+{\sp
+{\sn shapeType}
+{\sv 5}
+}
+}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 4e9e881..e1437c8 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -163,6 +163,7 @@ public:
void testFdo47440();
void testFdo53556();
void testFdo63428();
+void testGroupshapeRotation();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -310,6 +311,7 @@ void Test::run()
{fdo47440.rtf, Test::testFdo47440},
{fdo53556.rtf, Test::testFdo53556},
{hello.rtf, Test::testFdo63428},
+{groupshape-rotation.rtf, Test::testGroupshapeRotation},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1520,6 +1522,14 @@ void Test::testFdo63428()
CPPUNIT_ASSERT_EQUAL(OUString(TextFieldEnd),
getPropertyOUString(getRun(getParagraph(1), 4), TextPortionType));
}
+void Test::testGroupshapeRotation()
+{
+// Rotation on groupshapes wasn't handled correctly, RotateAngle was 4500.
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(315 * 100),
getPropertysal_Int32(xDraws-getByIndex(0), RotateAngle));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 0f3bdb1..58c891a 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\
sfx \
sot \
svt \
+ svxcore \
tl \
utl \
vcl \
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 49fe964..1aa7814 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3931,6 +3931,12 @@ int RTFDocumentImpl::popState()
aState.aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
if (m_aStates.top().bHadShapeText)
m_pSdrImport-append(aState.aShape.aProperties.back().first,
aState.aShape.aProperties.back().second);
+else if
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |4
++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7a66bd77131ebae661887c561168f513ca5a5052
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Aug 13 11:01:54 2013 +0200
Fix fdo#67908 - keep Visual around until after GL context is created.
Change-Id: Ie84decdccfa5bbf44c9cb05e2c2229f7384c1912
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 65c992a..23c10a0 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -578,7 +578,6 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
vi = glXGetVisualFromFBConfig( GLWin.dpy, fbconfigs[i] );
mbHasTFPVisual = true;
pChildSysData = lcl_createSystemWindow( vi, pPWindow, pWindow
);
-XFree ( vi );
SAL_INFO(slideshow.opengl, found visual suitable for
texture_from_pixmap);
} else if( firstVisual pAttributeTable[1] == NULL ) {
vi = firstVisual;
@@ -599,7 +598,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
}
#if defined( GLX_VERSION_1_3 ) defined( GLX_EXT_texture_from_pixmap )
-if ( firstVisual )
+if ( firstVisual vi != firstVisual )
XFree (firstVisual);
#endif
@@ -681,6 +680,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView(
const Reference presenta
GLWin.vi,
0,
GL_TRUE);
+XFree ( GLWin.vi );
if( GLWin.ctx == NULL ) {
SAL_INFO(slideshow.opengl, unable to create GLX context);
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: matching VCL to touch screen coordinates
we're calling the scrollbar's DoScroll methods. ScrollBar* pScrl; pScrl-DoScroll( nNewPos ); On Tue, Aug 13, 2013 at 11:46 AM, Thorsten Behrens t...@documentfoundation.org wrote: Ptyl Dragon wrote: Still, this is relevant mainly to zoom (the 2 nd part of my question) What about the scroll? What determines its granularity, and what would be the best way to increase its precision, from the current approx 4 - 8 pixels click, to a 1 pixel click? Does that come from the scrollbar, or are you calling Writer methods directly? Again, being able to look at code would make this easier. ;) Cheers, -- Thorsten -- [image: appicon.png] *Ptyl Dragon* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9b56ecd00f409000a3c703bfe291a06b77bfe943 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Aug 13 11:11:53 2013 +0200 Uploading libwpd-0.9.9 release Change-Id: If20156c48ec145389750a2283efad055d3b84363 diff --git a/download.lst b/download.lst index 8bf3694..b8259aa 100644 --- a/download.lst +++ b/download.lst @@ -91,7 +91,7 @@ export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip export TOMCAT_TARBALL := 63574e3ada44f473892a61a2da433a59-apache-tomcat-5.5.36-src.tar.gz export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz export VIGRA_TARBALL := d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz -export WPD_TARBALL := 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 +export WPD_TARBALL := a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 export WPG_TARBALL := b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/options/optaboutconfig.cxx | 155 +++---
cui/source/options/optaboutconfig.hxx | 28 +
cui/uiconfig/ui/aboutconfigvaluedialog.ui | 103 +++
4 files changed, 274 insertions(+), 13 deletions(-)
New commits:
commit a27bc43cb65d8489e96415fb8ffeae53f49919b9
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Wed Aug 7 16:32:34 2013 +0300
Expert config edit button implemented.
Value modifying dialog added. Checking if property changed before from a
vector. Not stable but working.
Change-Id: Id2b5ac102007af21ec12635b98f24a11c5befc90
Reviewed-on: https://gerrit.libreoffice.org/5306
Tested-by: Katarina Behrens bu...@bubli.org
Tested-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Thorsten Behrens tbehr...@suse.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 1d2023e..8656f3b 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui))
$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/aboutconfigdialog\
+ cui/uiconfig/ui/aboutconfigvaluedialog \
cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acoroptionspage \
cui/uiconfig/ui/acorreplacepage \
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 2b26768..30b79d8 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -18,8 +18,11 @@
#include com/sun/star/beans/Property.hpp
#include com/sun/star/beans/XProperty.hpp
#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/container/XNameReplace.hpp
#include com/sun/star/container/XHierarchicalNameAccess.hpp
+#include com/sun/star/util/XChangesBatch.hpp
+#include vector
using namespace svx;
using namespace ::com::sun::star;
@@ -31,6 +34,20 @@ using namespace com::sun::star::container;
#define ITEMID_TYPE 3
#define ITEMID_VALUE4
+struct Prop_Impl
+{
+OUStringName;
+OUStringProperty;
+Any Value;
+
+Prop_Impl( const OUString sName, const OUString sProperty, const Any
aValue )
+: Name( sName )
+, Property( sProperty )
+, Value( aValue )
+{
+}
+};
+
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet rItemSet )
:SfxTabPage( pParent, AboutConfig, cui/ui/aboutconfigdialog.ui,
rItemSet)
{
@@ -92,8 +109,10 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet )
OUString sRootNodePath = /;
pPrefBox-Clear();
+VectorOfModified.clear();
+
m_pDefaultBtn-Enable(sal_False);
-m_pEditBtn-Enable(sal_False);
+//m_pEditBtn-Enable(sal_False);
const char* entries[] = {
/org.openoffice.Office.Common,
@@ -106,10 +125,35 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet )
Reference XNameAccess xConfigAccess = getConfigAccess(
sRootNodePath, sal_False );
FillItems( xConfigAccess, sRootNodePath );
}
+}
+
+sal_Bool CuiAboutConfigTabPage::FillItemSet( SfxItemSet )
+{
+sal_Bool bModified = sal_False;
+Reference XNameAccess xUpdateAccess = getConfigAccess( /, sal_True );
+//Reference XNameReplace xNameReplace( xUpdateAccess, UNO_QUERY_THROW );
+
+//if( !xNameReplace.is() )
+//return bModified;
+
+for( size_t nInd = 0; nInd VectorOfModified.size(); ++nInd )
+{
+//beans::NamedValue aNamedValue = VectorOfModified[ nInd ];
+Prop_Impl* aNamedValue = VectorOfModified[ nInd ];
+
+xUpdateAccess = getConfigAccess( aNamedValue-Name , sal_True );
+Reference XNameReplace xNameReplace( xUpdateAccess, UNO_QUERY_THROW
);
+
+xNameReplace-replaceByName( aNamedValue-Property, aNamedValue-Value
);
+bModified = sal_True;
+}
- //Reference XNameAccess xConfigAccess = getConfigAccess( sRootNodePath,
sal_False );
+Reference util::XChangesBatch xChangesBatch( xUpdateAccess,
UNO_QUERY_THROW );
+
+xChangesBatch-commitChanges();
+
+return bModified;
- //FillItems( xConfigAccess, sRootNodePath );
}
void CuiAboutConfigTabPage::FillItems( Reference XNameAccess xNameAccess,
OUString sPath)
@@ -221,7 +265,7 @@ void CuiAboutConfigTabPage::FillItems( Reference
XNameAccess xNameAccess, OUSt
default:
{
-sValue = OUString(test);
+sValue = OUString();
}
}
}
@@ -264,6 +308,45 @@ Reference XNameAccess
CuiAboutConfigTabPage::getConfigAccess( OUString sNodeP
return xNameAccess;
}
+//void CuiAboutConfigTabPage::AddToModifiedVector( beans::NamedValue rProp )
+void CuiAboutConfigTabPage::AddToModifiedVector( Prop_Impl* rProp )
+{
+bool isModifiedBefore = false;
+//Check if value
Writer crash
Hi Caolán, I founnd a problem with your commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f41e7c704898fa0e86d6d128f5bd28f37c081e92 When I try to modify a character style Writer crashes. After a bit debug I found that your commit changed SwDocShell::Edit() (in docst.cxx) method sixth parameter from sal_uInt16 to OString but at docst.cxx:448 this Edit method is called with 0 as sixth parameter, which haven't sense in the new context but interpreted as an rtl_String null pointer and used to call OString constructor, which can't handle null pointers so Writer crashes. Best regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a0d1a3a5b81172a60dd6eefbedb9ea5d69859b8 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Aug 13 11:11:53 2013 +0200 Uploading libwpd-0.9.9 release (cherry picked from commit 9b56ecd00f409000a3c703bfe291a06b77bfe943) Signed-off-by: David Tardon dtar...@redhat.com Conflicts: download.lst Change-Id: If20156c48ec145389750a2283efad055d3b84363 diff --git a/download.lst b/download.lst index 3bf7104..116a7e3 100644 --- a/download.lst +++ b/download.lst @@ -84,7 +84,7 @@ export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz -export WPD_TARBALL := 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 +export WPD_TARBALL := a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 export WPG_TARBALL := b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 export XPDF_TARBALL := 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 15 --- source/text/shared/01/01010304.xhp | 25 + source/text/shared/optionen/01010100.xhp | 16 3 files changed, 21 insertions(+), 35 deletions(-) New commits: commit b75df5eeb8b4275609246c4623ae437fd580a3e4 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 10:50:24 2013 +0100 update help ids for business data page .ui conversion Change-Id: Ibbb6c5c6885db57de12cc0010757a77157c8f806 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 68d135e..f091b5f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3819,7 +3819,6 @@ HID_TPROTATION_CTRL1,33994, HID_TPROTATION_CTRL2,33995, HID_TPSHADOW_CTRL,33990, HID_TPSIZE_CTRL,33993, -HID_TP_BUSINESS_DATA,53248, HID_TP_CUSTOMPROPERTIES,33392, HID_TP_TOX_ENTRY,53240, HID_TP_TOX_SELECT,53239, @@ -7576,20 +7575,6 @@ sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035, sw_Edit_DLG_MM_QUERY_ED_TEXT,1435469884, sw_Edit_DLG_MM_SAVEWARNING_ED_FILENAME,1435453444, sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY,1435322396, -sw_Edit_TP_BUSINESS_DATA_ED_CITY,879233063, -sw_Edit_TP_BUSINESS_DATA_ED_COMP,879233079, -sw_Edit_TP_BUSINESS_DATA_ED_COMP_EXT,879233081, -sw_Edit_TP_BUSINESS_DATA_ED_COUNTRY,879233065, -sw_Edit_TP_BUSINESS_DATA_ED_FAX,879233073, -sw_Edit_TP_BUSINESS_DATA_ED_MAIL,879233076, -sw_Edit_TP_BUSINESS_DATA_ED_MOBILE,879233071, -sw_Edit_TP_BUSINESS_DATA_ED_PHONE,879233070, -sw_Edit_TP_BUSINESS_DATA_ED_POSITION,879233085, -sw_Edit_TP_BUSINESS_DATA_ED_SLOGAN,879233083, -sw_Edit_TP_BUSINESS_DATA_ED_STATE,879233077, -sw_Edit_TP_BUSINESS_DATA_ED_STREET,879233060, -sw_Edit_TP_BUSINESS_DATA_ED_WWW,879233075, -sw_Edit_TP_BUSINESS_DATA_ED_ZIP,879233062, sw_Edit_TP_FLD_DB_ED_DBCONDITION,878708744, sw_Edit_TP_FLD_DB_ED_DBSETNUMBER,878708745, sw_Edit_TP_FLD_DOK_ED_DOKVALUE,878757943, diff --git a/source/text/shared/01/01010304.xhp b/source/text/shared/01/01010304.xhp index 35f452d..20408e1 100644 --- a/source/text/shared/01/01010304.xhp +++ b/source/text/shared/01/01010304.xhp @@ -38,31 +38,32 @@ section id=howtoget embed href=text/shared/00/0401.xhp#viskartgesch/ /section +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/businessdatapage/BusinessDataPage id=bm_id3147652 localize=false/ paragraph role=heading id=hd_id3149549 xml-lang=en-US level=2 l10n=U oldref=3Business data/paragraph paragraph role=paragraph id=par_id3156027 xml-lang=en-US l10n=U oldref=4Enter the contact information that you want to include on your business card./paragraph paragraph role=note id=par_id3155892 xml-lang=en-US l10n=U oldref=17If you want to include your name on a business card, enter your name on the emphPrivate /emphtab. Then choose a layout on the emphBusiness Cards /emphtab that includes a name placeholder./paragraph embed href=text/shared/optionen/01010100.xhp#datenf/ -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT id=bm_id3147653 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/businessdatapage/company2 id=bm_id3147653 localize=false/ paragraph role=heading id=hd_id3150355 xml-lang=en-US level=3 l10n=U oldref=5Company 2nd line/paragraph -paragraph role=paragraph id=par_id3153031 xml-lang=en-US l10n=U oldref=6ahelp hid=SW:EDIT:TP_BUSINESS_DATA:ED_COMP_EXTEnter additional company details./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN id=bm_id3149955 localize=false/ +paragraph role=paragraph id=par_id3153031 xml-lang=en-US l10n=U oldref=6ahelp hid=modules/swriter/ui/businessdatapage/company2Enter additional company details./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/businessdatapage/slogan id=bm_id3149955 localize=false/ paragraph role=heading id=hd_id3150771 xml-lang=en-US level=3 l10n=U oldref=7Slogan/paragraph -paragraph role=paragraph id=par_id3156327 xml-lang=en-US l10n=U oldref=8ahelp hid=SW:EDIT:TP_BUSINESS_DATA:ED_SLOGANEnter the slogan of your company./ahelp/paragraph +paragraph role=paragraph id=par_id3156327 xml-lang=en-US l10n=U oldref=8ahelp hid=modules/swriter/ui/businessdatapage/sloganEnter the slogan of your company./ahelp/paragraph embed href=text/shared/optionen/01010100.xhp#strplzort/ -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_BUSINESS_DATA:ED_STATE id=bm_id3145416 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/businessdatapage/state id=bm_id3145416 localize=false/ paragraph role=heading id=hd_id3153146 xml-lang=en-US level=3 l10n=U oldref=9Country/paragraph -paragraph role=paragraph id=par_id3155449 xml-lang=en-US l10n=U oldref=10ahelp hid=SW:EDIT:TP_BUSINESS_DATA:ED_STATEEnter the name of the country where your business is located./ahelp/paragraph +paragraph role=paragraph id=par_id3155449 xml-lang=en-US l10n=U oldref=10ahelp hid=modules/swriter/ui/businessdatapage/stateEnter the name of the country where your
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 97e24a710d57cc82a31e956ccf9fc484b62011ec
Author: Tor Lillqvist t...@iki.fi
Date: Tue Aug 13 12:59:08 2013 +0300
Also ' was duplicated
Thanks to dougmencken for noticing.
Change-Id: If9b18b7686981b523e8422cecef0930fded10c91
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index dc71b16..b4a25af 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -83,7 +83,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool*
pItemPool ) :
aMinAutoPaperSize( 0x0, 0x0 ),
aMaxAutoPaperSize( 0x7FFF, 0x7FFF ),
aEditDoc( pItemPool ),
-aWordDelimiters( .,;:-'`'?!_=\{}()[]),
+aWordDelimiters( .,;:-`'?!_=\{}()[]),
bKernAsianPunctuation(false),
bAddExtLeading(false),
bIsFormatting(false),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: matching VCL to touch screen coordinates
Ptyl Dragon wrote: we're calling the scrollbar's DoScroll methods. That in turn seems to then end up in vcl/source/window/window.cxx's Window::ImplScroll() method - worth stepping through that I guess. If the scroll distance scaling is too coarse (i.e. you already get a 1 for either nHorzScroll or nVertScroll), you could try to set the MapMode to MAP_PIXEL temporarily, just for the scrolling. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy officecfg/registry
icon-themes/galaxy/cmd/lc_fliphorizontal.png |binary icon-themes/galaxy/cmd/lc_flipvertical.png|binary icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png |1 + icon-themes/galaxy/cmd/lc_objectmirrorvertical.png|1 + officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 +++- 5 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 25e23919c8d8530089bd78bc33689a955e7f49ee Author: Joel Madero jmadero@gmail.com Date: Mon Aug 12 21:56:58 2013 -0700 fdo#67585 Spreadsheet Label Consistency + Icons Changed label under format - flip - Flip Object Vertically to Flip Vertically to be consisten with other flip labels in Spreadsheet and Writer. Added icons for Spreadsheet flip commands - used same icons used for flip commands in writer. modified: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png icon-themes/galaxy/cmd/lc_objectmirrorvertical.png icon-themes/galaxy/cmd/sc_objectmirrorhorizontal.png icon-themes/galaxy/cmd/sc_objectmirrorvertical.png Change-Id: If09c89f68356258ee72be116738dc4d2d81a79c8 Reviewed-on: https://gerrit.libreoffice.org/5378 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/icon-themes/galaxy/cmd/lc_fliphorizontal.png b/icon-themes/galaxy/cmd/lc_fliphorizontal.png index 67c5743..2f4e8c1 100644 Binary files a/icon-themes/galaxy/cmd/lc_fliphorizontal.png and b/icon-themes/galaxy/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/galaxy/cmd/lc_flipvertical.png b/icon-themes/galaxy/cmd/lc_flipvertical.png index fd582af..c0f967c 100644 Binary files a/icon-themes/galaxy/cmd/lc_flipvertical.png and b/icon-themes/galaxy/cmd/lc_flipvertical.png differ diff --git a/icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png b/icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png new file mode 12 index 000..bf3e205 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png @@ -0,0 +1 @@ +/data/git/libreoffice/icon-themes/galaxy/cmd/lc_fliphorizontal.png \ No newline at end of file diff --git a/icon-themes/galaxy/cmd/lc_objectmirrorvertical.png b/icon-themes/galaxy/cmd/lc_objectmirrorvertical.png new file mode 12 index 000..9c9ca97 --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_objectmirrorvertical.png @@ -0,0 +1 @@ +/data/git/libreoffice/icon-themes/galaxy/cmd/lc_flipvertical.png \ No newline at end of file diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 1bea73a..1f9e96b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -15,6 +15,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-USFlip Vertically/value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:NumberFormatType oor:op=replace prop oor:name=Label oor:type=xs:string @@ -23,7 +26,10 @@ /node node oor:name=.uno:ObjectMirrorHorizontal oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USFlip Object Horizontally/value + value xml:lang=en-USFlip Horizontally/value +/prop +prop oor:name=Properties oor:type=xs:int + value1/value /prop /node node oor:name=.uno:ShowPrecedents oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools include/svx svx/source
include/svtools/ruler.hxx |4 ++--
include/svx/dialogs.hrc |5 +++--
svx/source/dialog/ruler.src |8
3 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 5a2c13a79a639a8ed98873d3acd7ed074c2b00b5
Author: Joel Madero jmadero@gmail.com
Date: Mon Aug 12 21:42:46 2013 -0700
fdo#59981 Rearrange Ruler Tab Stops
Per request by user rearranged ruler tab stop order in order to put least
used one at the bottom of the list. Previously the order was
Left, Right, Decimal, Center, now it is Left, Right, Center, Decimal
modified: include/svtools/ruler.hxx
modified: include/svx/dialogs.hrc
modified: svx/source/dialog/ruler.src
Change-Id: I1e59dcad4ee476d2d67339e973eedc96f406ec28
Reviewed-on: https://gerrit.libreoffice.org/5381
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index b37aa81..1ef4c86 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -561,8 +561,8 @@ struct RulerIndent
#define RULER_TAB_LEFT ((sal_uInt16)0x)
#define RULER_TAB_RIGHT ((sal_uInt16)0x0001)
-#define RULER_TAB_DECIMAL ((sal_uInt16)0x0002)
-#define RULER_TAB_CENTER((sal_uInt16)0x0003)
+#define RULER_TAB_CENTER((sal_uInt16)0x0002)
+#define RULER_TAB_DECIMAL ((sal_uInt16)0x0003)
#define RULER_TAB_DEFAULT ((sal_uInt16)0x0004)
#define RULER_TAB_STYLE ((sal_uInt16)0x000F)
#define RULER_TAB_RTL ((sal_uInt16)0x0010)
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index b57e02f..f5f0166 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -298,8 +298,9 @@
#define RID_SVXSTR_RULER_START (RID_SVX_START + 245)
#define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245)
#define RID_SVXSTR_RULER_TAB_RIGHT (RID_SVX_START + 246)
-#define RID_SVXSTR_RULER_TAB_DECIMAL(RID_SVX_START + 247)
-#define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248)
+#define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 247)
+#define RID_SVXSTR_RULER_TAB_DECIMAL(RID_SVX_START + 248)
+
// Close (in TabDialog line/aria)
#define RID_SVXSTR_CLOSE(RID_SVX_START + 260)
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index 529a766..acceba4 100644
--- a/svx/source/dialog/ruler.src
+++ b/svx/source/dialog/ruler.src
@@ -100,13 +100,13 @@ String RID_SVXSTR_RULER_TAB_RIGHT
{
Text [ en-US ] = Right ;
};
-String RID_SVXSTR_RULER_TAB_DECIMAL
-{
-Text [ en-US ] = Decimal ;
-};
String RID_SVXSTR_RULER_TAB_CENTER
{
Text [ en-US ] = Center ;
};
+String RID_SVXSTR_RULER_TAB_DECIMAL
+{
+Text [ en-US ] = Decimal ;
+};
/* 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: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx| 32 +++
xmlhelp/source/cxxhelp/provider/urlparameter.cxx |7 -
xmlhelp/source/treeview/tvread.cxx | 12
3 files changed, 13 insertions(+), 38 deletions(-)
New commits:
commit 87b5ac652d9625545a62fac83bccce369976140c
Author: Jelle van der Waa je...@vdwaa.nl
Date: Mon Aug 12 21:29:22 2013 +0200
fdo#57950: Remove some chained appends in xmhelp
Change-Id: I4680547aa1d12d3e8eab3c33e3158845848c2068
Reviewed-on: https://gerrit.libreoffice.org/5376
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index e19dc00..b961caf 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -576,7 +576,7 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const
OUString Database,
osl::MutexGuard aGuard( m_aMutex );
OUString aFileExt( helpText ? OUString(.ht) : OUString(.db) );
-OUString dbFileName =
OUStringBuffer().append('/').append(Database).append(aFileExt).makeStringAndClear();
+OUString dbFileName = / + Database + aFileExt;
OUString key;
if( pExtensionPath == NULL )
key = processLang( Language ) + dbFileName;
@@ -920,7 +920,7 @@ Reference XHierarchicalNameAccess Databases::jarFile(
const OUString jar,
{
return Reference XHierarchicalNameAccess ( 0 );
}
-OUString key =
OUStringBuffer(processLang(Language)).append('/').append(jar).makeStringAndClear();
+OUString key = processLang(Language) + / + jar;
osl::MutexGuard aGuard( m_aMutex );
@@ -940,12 +940,7 @@ Reference XHierarchicalNameAccess Databases::jarFile(
const OUString jar,
OUString aExtensionPath = jar.copy( nQuestionMark1 + 1,
nQuestionMark2 - nQuestionMark1 - 1 );
OUString aPureJar = jar.copy( nQuestionMark2 + 1 );
-OUStringBuffer aStrBuf;
-aStrBuf.append( aExtensionPath );
-aStrBuf.append( '/' );
-aStrBuf.append( aPureJar );
-
-zipFile = expandURL( aStrBuf.makeStringAndClear() );
+zipFile = expandURL( aExtensionPath + / + aPureJar );
}
else
{
@@ -1485,18 +1480,13 @@ OUString ExtensionIteratorBase::implGetFileFromPackage(
OUString aLanguage = m_aLanguage;
for( sal_Int32 iPass = 0 ; iPass 2 ; ++iPass )
{
-OUStringBuffer aStrBuf;
-aStrBuf.append( xPackage-getRegistrationDataURL().Value);
-aStrBuf.append( '/' );
-aStrBuf.append( aLanguage );
+OUString aStr = xPackage-getRegistrationDataURL().Value + / +
aLanguage;
if( !bLangFolderOnly )
{
-aStrBuf.append( '/' );
-aStrBuf.append( help );
-aStrBuf.append( rFileExtension );
+aStr += /help + rFileExtension;
}
-aFile = m_rDatabases.expandURL( aStrBuf.makeStringAndClear() );
+aFile = m_rDatabases.expandURL( aStr );
if( iPass == 0 )
{
if( m_xSFA-exists( aFile ) )
@@ -1626,7 +1616,7 @@ helpdatafileproxy::Hdf*
DataBaseIterator::implGetHdfFromPackage( Reference depl
helpdatafileproxy::Hdf* pRetHdf = NULL;
if (optRegData.IsPresent !optRegData.Value.isEmpty())
{
-OUString aRegDataUrl =
OUStringBuffer(optRegData.Value).append('/').makeStringAndClear();
+OUString aRegDataUrl = optRegData.Value + /;
OUString aHelpFilesBaseName(help);
@@ -1652,7 +1642,7 @@ helpdatafileproxy::Hdf*
DataBaseIterator::implGetHdfFromPackage( Reference depl
*o_pExtensionPath = aRegDataUrl + aUsedLanguage;
if( o_pExtensionRegistryPath )
-*o_pExtensionRegistryPath =
OUStringBuffer(xPackage-getURL()).append('/').append(aUsedLanguage).makeStringAndClear();
+*o_pExtensionRegistryPath = xPackage-getURL() + / +
aUsedLanguage;
}
return pRetHdf;
@@ -1869,9 +1859,9 @@ OUString IndexFolderIterator::nextIndexFolder( bool
o_rbExtension, bool o_rbTe
switch( m_eState )
{
case INITIAL_MODULE:
-aIndexFolder =
OUStringBuffer(m_rDatabases.getInstallPathAsURL()).
-append(m_rDatabases.processLang(m_aLanguage)).append('/').
-
append(m_aInitialModule).append(.idxl).makeStringAndClear();
+aIndexFolder = m_rDatabases.getInstallPathAsURL()
++ m_rDatabases.processLang(m_aLanguage) + /
++ m_aInitialModule + .idxl;
o_rbTemporary = false;
o_rbExtension = false;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 254be31..8cc8cf8 100644
---
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx| 65 ++-
pyuno/source/module/pyuno_impl.hxx |2 +
pyuno/source/module/pyuno_module.cxx |2 +
3 files changed, 45 insertions(+), 24 deletions(-)
New commits:
commit 1be8e912ba8a7d1acaf40d5a8597421c104ab39c
Author: David Bolen db3l@gmail.com
Date: Fri Aug 9 23:35:27 2013 -0400
fdo#50470: Restore pyuno object method introspection in Python 3
Switch to __dir__ entry point for introspection as Python 3 dropped support
for __members__/__methods__. This is backwards compatible to Python 2.6.
Module initialization adjusted to complete type setup (needed for tp_dict)
via PyType_Ready.
Change-Id: Ie1f7b9dd4279242de89d009eb7acdc8c786dab8f
Reviewed-on: https://gerrit.libreoffice.org/5375
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 58579eb..7a420a6 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -427,6 +427,32 @@ PyObject *PyUNO_str( PyObject * self )
return PyStr_FromString( buf.getStr());
}
+PyObject* PyUNO_dir (PyObject* self)
+{
+PyUNO* me = (PyUNO*) self;
+
+PyObject* member_list = NULL;
+SequenceOUString oo_member_list;
+
+try
+{
+oo_member_list = me-members-xInvocation-getMemberNames ();
+member_list = PyList_New (oo_member_list.getLength ());
+for (int i = 0; i oo_member_list.getLength (); i++)
+{
+// setitem steals a reference
+PyList_SetItem (member_list, i,
ustring2PyString(oo_member_list[i]).getAcquired() );
+}
+}
+catch( const RuntimeException e )
+{
+raisePyExceptionWithAny( makeAny(e) );
+}
+
+return member_list;
+}
+
+
PyObject* PyUNO_getattr (PyObject* self, char* name)
{
PyUNO* me;
@@ -437,31 +463,10 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
Runtime runtime;
me = (PyUNO*) self;
-//Handle Python dir () stuff first...
-if (strcmp (name, __members__) == 0)
-{
-PyObject* member_list;
-SequenceOUString oo_member_list;
-
-oo_member_list = me-members-xInvocation-getMemberNames ();
-member_list = PyList_New (oo_member_list.getLength ());
-for (int i = 0; i oo_member_list.getLength (); i++)
-{
-// setitem steals a reference
-PyList_SetItem (member_list, i,
ustring2PyString(oo_member_list[i]).getAcquired() );
-}
-return member_list;
-}
-
if (strcmp (name, __dict__) == 0)
{
-Py_INCREF (Py_None);
-return Py_None;
-}
-if (strcmp (name, __methods__) == 0)
-{
-Py_INCREF (Py_None);
-return Py_None;
+Py_INCREF (Py_TYPE(me)-tp_dict);
+return Py_TYPE(me)-tp_dict;
}
if (strcmp (name, __class__) == 0)
{
@@ -638,6 +643,13 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject
*that, int op )
return result;
}
+static PyMethodDef PyUNOMethods[] =
+{
+{__dir__, (PyCFunction)PyUNO_dir, METH_NOARGS, NULL},
+{NULL, NULL, 0, NULL}
+};
+
+
/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
#ifdef Py_TPFLAGS_HAVE_RICHCOMPARE
#define TP_FLAGS (Py_TPFLAGS_HAVE_RICHCOMPARE)
@@ -674,7 +686,7 @@ static PyTypeObject PyUNOType =
0,
(getiterfunc)0,
(iternextfunc)0,
-NULL,
+PyUNOMethods,
NULL,
NULL,
NULL,
@@ -698,6 +710,11 @@ static PyTypeObject PyUNOType =
#endif
};
+int PyUNO_initType()
+{
+return PyType_Ready(PyUNOType);
+}
+
PyRef getPyUnoClass()
{
return PyRef( reinterpret_cast PyObject * ( PyUNOType ) );
diff --git a/pyuno/source/module/pyuno_impl.hxx
b/pyuno/source/module/pyuno_impl.hxx
index b114b3c..1222bf3 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -188,6 +188,8 @@ typedef ::boost::unordered_map
typedef ::boost::unordered_set PyRef , PyRef::Hash , std::equal_toPyRef
ClassSet;
+int PyUNO_initType();
+
PyObject* PyUNO_new(
const com::sun::star::uno::Any targetInterface,
const
com::sun::star::uno::Referencecom::sun::star::lang::XSingleServiceFactory
ssf);
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index cb8fd95..1e812d1 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -867,6 +867,7 @@ extern C
#if PY_MAJOR_VERSION = 3
PyObject* PyInit_pyuno()
{
+PyUNO_initType();
// noop when called already, otherwise needed to allow multiple threads
PyEval_InitThreads();
static struct PyModuleDef moduledef =
@@ -886,6 +887,7 @@ PyObject* PyInit_pyuno()
#else
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - pyuno/source
pyuno/source/module/pyuno.cxx| 65 ++-
pyuno/source/module/pyuno_impl.hxx |2 +
pyuno/source/module/pyuno_module.cxx |2 +
3 files changed, 45 insertions(+), 24 deletions(-)
New commits:
commit 125be9e41c2a6d40bf4646d4a8af96f5d97994d8
Author: David Bolen db3l@gmail.com
Date: Fri Aug 9 23:35:27 2013 -0400
fdo#50470: Restore pyuno object method introspection in Python 3
Switch to __dir__ entry point for introspection as Python 3 dropped support
for __members__/__methods__. This is backwards compatible to Python 2.6.
Module initialization adjusted to complete type setup (needed for tp_dict)
via PyType_Ready.
Change-Id: Ie1f7b9dd4279242de89d009eb7acdc8c786dab8f
Reviewed-on: https://gerrit.libreoffice.org/5375
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 1be8e912ba8a7d1acaf40d5a8597421c104ab39c)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 4c6191d..36f7c92 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -429,6 +429,32 @@ PyObject *PyUNO_str( PyObject * self )
return PyStr_FromString( buf.getStr());
}
+PyObject* PyUNO_dir (PyObject* self)
+{
+PyUNO* me = (PyUNO*) self;
+
+PyObject* member_list = NULL;
+SequenceOUString oo_member_list;
+
+try
+{
+oo_member_list = me-members-xInvocation-getMemberNames ();
+member_list = PyList_New (oo_member_list.getLength ());
+for (int i = 0; i oo_member_list.getLength (); i++)
+{
+// setitem steals a reference
+PyList_SetItem (member_list, i,
ustring2PyString(oo_member_list[i]).getAcquired() );
+}
+}
+catch( const RuntimeException e )
+{
+raisePyExceptionWithAny( makeAny(e) );
+}
+
+return member_list;
+}
+
+
PyObject* PyUNO_getattr (PyObject* self, char* name)
{
PyUNO* me;
@@ -439,31 +465,10 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
Runtime runtime;
me = (PyUNO*) self;
-//Handle Python dir () stuff first...
-if (strcmp (name, __members__) == 0)
-{
-PyObject* member_list;
-SequenceOUString oo_member_list;
-
-oo_member_list = me-members-xInvocation-getMemberNames ();
-member_list = PyList_New (oo_member_list.getLength ());
-for (int i = 0; i oo_member_list.getLength (); i++)
-{
-// setitem steals a reference
-PyList_SetItem (member_list, i,
ustring2PyString(oo_member_list[i]).getAcquired() );
-}
-return member_list;
-}
-
if (strcmp (name, __dict__) == 0)
{
-Py_INCREF (Py_None);
-return Py_None;
-}
-if (strcmp (name, __methods__) == 0)
-{
-Py_INCREF (Py_None);
-return Py_None;
+Py_INCREF (Py_TYPE(me)-tp_dict);
+return Py_TYPE(me)-tp_dict;
}
if (strcmp (name, __class__) == 0)
{
@@ -642,6 +647,13 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject
*that, int op )
return result;
}
+static PyMethodDef PyUNOMethods[] =
+{
+{__dir__, (PyCFunction)PyUNO_dir, METH_NOARGS, NULL},
+{NULL, NULL, 0, NULL}
+};
+
+
/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
#ifdef Py_TPFLAGS_HAVE_RICHCOMPARE
#define TP_FLAGS (Py_TPFLAGS_HAVE_RICHCOMPARE)
@@ -678,7 +690,7 @@ static PyTypeObject PyUNOType =
0,
(getiterfunc)0,
(iternextfunc)0,
-NULL,
+PyUNOMethods,
NULL,
NULL,
NULL,
@@ -702,6 +714,11 @@ static PyTypeObject PyUNOType =
#endif
};
+int PyUNO_initType()
+{
+return PyType_Ready(PyUNOType);
+}
+
PyRef getPyUnoClass()
{
return PyRef( reinterpret_cast PyObject * ( PyUNOType ) );
diff --git a/pyuno/source/module/pyuno_impl.hxx
b/pyuno/source/module/pyuno_impl.hxx
index 9524523..23ca1fc 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -188,6 +188,8 @@ typedef ::boost::unordered_map
typedef ::boost::unordered_set PyRef , PyRef::Hash , std::equal_toPyRef
ClassSet;
+int PyUNO_initType();
+
PyObject* PyUNO_new(
const com::sun::star::uno::Any targetInterface,
const
com::sun::star::uno::Referencecom::sun::star::lang::XSingleServiceFactory
ssf);
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index 06632c8..95f5369 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -867,6 +867,7 @@ extern C
#if PY_MAJOR_VERSION = 3
PyObject* PyInit_pyuno()
{
+PyUNO_initType();
// noop when called already, otherwise needed to allow multiple threads
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/tool/formulaopt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 17c6687eb0c29cba8b0ef981eb6201e794ba3d57
Author: Noel Power noel.po...@suse.com
Date: Mon Aug 12 17:44:26 2013 +0100
doh unitialised variable
Change-Id: Ief70ed0e8f06715b1909e769b031db0dcaf0095d
(cherry picked from commit b59d116bf7a056f9683010c5e612190278595772)
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index e6966e1..287028d 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -236,7 +236,7 @@ ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId()
static sal_uInt16 aVals[] = { SCFORMULAOPT_GRAMMAR,
SCFORMULAOPT_ENGLISH_FUNCNAME, SCFORMULAOPT_SEP_ARG,
SCFORMULAOPT_SEP_ARRAY_ROW, SCFORMULAOPT_SEP_ARRAY_COL,
SCFORMULAOPT_STRING_REF_SYNTAX, SCFORMULAOPT_EMPTY_STRING_AS_ZERO,
SCFORMULAOPT_OOXML_RECALC, SCFORMULAOPT_ODF_RECALC, SCFORMULAOPT_OPENCL_ENABLED
};
OSL_ENSURE( SAL_N_ELEMENTS(aVals) == aPropNames.getLength(), Properties
and ids are out of Sync);
PropsToIds aPropIdMap;
-for ( sal_uInt16 i; iaPropNames.getLength(); ++i )
+for ( sal_uInt16 i=0; iaPropNames.getLength(); ++i )
aPropIdMap[aPropNames[i]] = aVals[ i ];
return aPropIdMap;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] iOS Impress remote app weekly report
Hello all, Here is what I've done during the past week: * The theme of the iOS app has been tuned to stay coherent with iOS7 UI guidelines (or almost) on previous versions of iOS. * The app has been tested and adjusted accordingly on iOS7 with actual devices for iPad and simulator for iPhone. This will assure a smooth transition to iOS7 in future releases. * The app support three languages now, namely en, fr and zh-hans (need some verification for the translation of course). I'm also interested to know how the LO-translation system works? As filmsi has pointed outhttp://siqi43.wordpress.com/2013/08/10/a-slightly-flattened-version-of-ios-impress-remote/comment-page-1/#comment-42 that this app will finally go through the .po files used internally in LibO. I would like to know how can I integrate it with iOS localization system. * The iOS5 support for storyboard localization is really poor in my view... it basically consists of copy-paste storyboards and thus one change in a storyboard will not be propagated to other storyboards accordingly. For that effect, I've used a python script to run alongside the build system to sync all storyboards based on the English one. This requires updates in build settings if anyone else is interested in building the app on their machines. * In summary, the app has been tested on iOS5, 6, 7 with localization to a certain extent. I will try my best to maintain maximum compatibility for now and consider dropping iOS5 support after iOS7's release. I'm currently working on the Bonjour support for Windows as I can finally build it on my windows machine. Cheers, Siqi -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/mtvelements.hxx |4 ++--
sc/source/core/data/mtvelements.cxx | 16
2 files changed, 2 insertions(+), 18 deletions(-)
New commits:
commit a745bfdb7843a216dae51e4cd9484d950bac13e2
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 13 13:50:12 2013 +0200
Ensure iterators are value-initialized
...instead of merely default-initialized, to avoid undefined behavior in
enclosing classes' copy ctors/assignment ops. (Cf. resolution of
http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-closed.html#408 DR 408 Is
vectorreverse_iteratorchar* forbidden?)
In return, remove the enclosing classes' user defined assignment ops that do
explicitly exactly what the default ones would do anyway.
Change-Id: If1bb1aea56dd48da873a92a8fa30dedea844740c
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 443eb6a..46a5d40 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -107,7 +107,7 @@ struct ColumnBlockPosition
CellTextAttrStoreType::iterator miCellTextAttrPos;
CellStoreType::iterator miCellPos;
-ColumnBlockPosition operator= (const ColumnBlockPosition r);
+ColumnBlockPosition(): miCellPos() {}
};
struct ColumnBlockConstPosition
@@ -116,7 +116,7 @@ struct ColumnBlockConstPosition
CellTextAttrStoreType::const_iterator miCellTextAttrPos;
CellStoreType::const_iterator miCellPos;
-ColumnBlockConstPosition operator= (const ColumnBlockConstPosition r);
+ColumnBlockConstPosition(): miCellPos() {}
};
class ColumnBlockPositionSet
diff --git a/sc/source/core/data/mtvelements.cxx
b/sc/source/core/data/mtvelements.cxx
index 57573a5..efe07cf 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -25,22 +25,6 @@ CellTextAttr::CellTextAttr(sal_uInt16 nTextWidth, sal_uInt8
nScriptType) :
mnTextWidth(nTextWidth),
mnScriptType(nScriptType) {}
-ColumnBlockPosition ColumnBlockPosition::operator= (const
ColumnBlockPosition r)
-{
-miBroadcasterPos = r.miBroadcasterPos;
-miCellTextAttrPos = r.miCellTextAttrPos;
-miCellPos = r.miCellPos;
-return *this;
-}
-
-ColumnBlockConstPosition ColumnBlockConstPosition::operator= (const
ColumnBlockConstPosition r)
-{
-miBroadcasterPos = r.miBroadcasterPos;
-miCellTextAttrPos = r.miCellTextAttrPos;
-miCellPos = r.miCellPos;
-return *this;
-}
-
ColumnBlockPositionSet::ColumnBlockPositionSet(ScDocument rDoc) : mrDoc(rDoc)
{}
ColumnBlockPosition* ColumnBlockPositionSet::getBlockPosition(SCTAB nTab,
SCCOL nCol)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source sw/source
include/svtools/parhtml.hxx|6 +--
svtools/source/svhtml/htmlsupp.cxx | 66 ++---
sw/source/filter/html/htmlbas.cxx | 40 +++---
sw/source/filter/html/htmlcss1.cxx |4 +-
sw/source/filter/html/htmldraw.cxx |4 +-
sw/source/filter/html/htmlfld.cxx | 13 ++-
sw/source/filter/html/htmlgrin.cxx |2 -
sw/source/filter/html/htmlnum.cxx |2 -
sw/source/filter/html/swhtml.cxx | 65 +---
sw/source/filter/html/swhtml.hxx | 32 -
10 files changed, 115 insertions(+), 119 deletions(-)
New commits:
commit 7a504c8752bf7c5accbb9bcc33a98f79b31b8bf2
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Fri Aug 9 13:51:08 2013 +0200
Change String to OUString in SwHTMLParser class
I changed some variables in SwHTMLParser class and her dependencies.
Change-Id: Ie8ad6c481df8a904bd358c2e9cd6afeef990d418
Reviewed-on: https://gerrit.libreoffice.org/5330
Reviewed-by: Tor Lillqvist t...@iki.fi
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 7df1d76..d82bbaf 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -252,13 +252,13 @@ public:
bool bSwitchToUCS2 = false,
rtl_TextEncoding eEnc=RTL_TEXTENCODING_DONTKNOW );
-bool ParseScriptOptions( String rLangString, const String,
HTMLScriptLanguage rLang,
- String rSrc, String rLibrary, String rModule );
+bool ParseScriptOptions( OUString rLangString, const OUString,
HTMLScriptLanguage rLang,
+ OUString rSrc, OUString rLibrary, OUString
rModule );
// Einen Kommentar um den Inhalt von SCRIPT oder STYLE entfernen
// Bei 'bFull' wird ggf. die gesammte Zeile hinter einem !--
// entfernt (fuer JavaSript)
-static void RemoveSGMLComment( String rString, sal_Bool bFull );
+static void RemoveSGMLComment( OUString rString, sal_Bool bFull );
static bool InternalImgToPrivateURL( String rURL );
static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator
*pHTTPHeader );
diff --git a/svtools/source/svhtml/htmlsupp.cxx
b/svtools/source/svhtml/htmlsupp.cxx
index 3d90fec..829e8f3 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -36,19 +36,19 @@ static HTMLOptionEnum const aScriptLangOptEnums[] =
{ 0,0 }
};
-bool HTMLParser::ParseScriptOptions( String rLangString, const String
rBaseURL,
+bool HTMLParser::ParseScriptOptions( OUString rLangString, const OUString
rBaseURL,
HTMLScriptLanguage rLang,
- String rSrc,
- String rLibrary,
- String rModule )
+ OUString rSrc,
+ OUString rLibrary,
+ OUString rModule )
{
const HTMLOptions aScriptOptions = GetOptions();
-rLangString.Erase();
+rLangString = ;
rLang = HTML_SL_JAVASCRIPT;
-rSrc.Erase();
-rLibrary.Erase();
-rModule.Erase();
+rSrc = ;
+rLibrary = ;
+rModule = ;
for( size_t i = aScriptOptions.size(); i; )
{
@@ -82,71 +82,71 @@ bool HTMLParser::ParseScriptOptions( String rLangString,
const String rBaseURL
return true;
}
-void HTMLParser::RemoveSGMLComment( String rString, sal_Bool bFull )
+void HTMLParser::RemoveSGMLComment( OUString rString, sal_Bool bFull )
{
sal_Unicode c = 0;
-while( rString.Len()
- ( ' '==(c=rString.GetChar(0)) || '\t'==c || '\r'==c || '\n'==c ) )
-rString.Erase( 0, 1 );
+while( !rString.isEmpty()
+ ( ' '==(c=rString[0]) || '\t'==c || '\r'==c || '\n'==c ) )
+rString = rString.copy( 1, rString.getLength() - 1 );
-while( rString.Len()
- ( ' '==(c=rString.GetChar( rString.Len()-1))
+while( !rString.isEmpty()
+ ( ' '==(c=rString[rString.getLength()-1])
|| '\t'==c || '\r'==c || '\n'==c ) )
-rString.Erase( rString.Len()-1 );
+rString = rString.copy( 0, rString.getLength()-1 );
// remove SGML comments
-if( rString.Len() = 4
-rString.CompareToAscii( !--, 4 ) == COMPARE_EQUAL )
+if( rString.getLength() = 4
+rString.startsWith( !-- ) )
{
-xub_StrLen nPos = 3;
+sal_Int32 nPos = 3;
if( bFull )
{
// the whole line
nPos = 4;
-while( nPos rString.Len()
-( ( c = rString.GetChar( nPos )) != '\r' c != '\n' ) )
+while( nPos rString.getLength()
+( ( c = rString[nPos] ) != '\r' c != '\n' ) )
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 39484, which changed state. Bug 39484 Summary: All Outline groups of sheet lost while editing https://bugs.freedesktop.org/show_bug.cgi?id=39484 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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: Changes to 'feature/calc-group-interpreter-2'
New branch 'feature/calc-group-interpreter-2' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/source sd/xml
sd/source/core/sdpage.cxx | 188 +++---
sd/xml/layoutlist.xml | 20
2 files changed, 35 insertions(+), 173 deletions(-)
New commits:
commit 6276440a71ce779951bb2de8e544701dd1fbed6d
Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com
Date: Tue Aug 13 19:15:14 2013 +0530
Adding vertical layouts to XML file.
The new vertical layouts and the old layouts works well on my maschine.
Also the 'vertical writing' mode seems to be working perfectly for
'vertical layouts'.
And removed the 'switch'case from the sdpage.cxx.
Change-Id: Ic9f6af68cdeb635f79e67b959f95ac0a79c119ca
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index d7b6f44..2693375 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1197,9 +1197,6 @@ rtl::OUString enumtoString(AutoLayout aut)
case AUTOLAYOUT_TITLE_CONTENT:
retstr=AUTOLAYOUT_TITLE_CONTENT;
break;
-case AUTOLAYOUT_TITLE_2VTEXT:
-retstr=AUTOLAYOUT_TITLE_2VTEXT;
-break;
case AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT:
retstr=AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT;
break;
@@ -1230,6 +1227,18 @@ rtl::OUString enumtoString(AutoLayout aut)
case AUTOLAYOUT_TITLE_2CONTENT:
retstr=AUTOLAYOUT_TITLE_2CONTENT;
break;
+case AUTOLAYOUT_VTITLE_VCONTENT:
+retstr=AUTOLAYOUT_VTITLE_VCONTENT;
+break;
+case AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT:
+retstr=AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT;
+break;
+case AUTOLAYOUT_TITLE_VCONTENT:
+retstr=AUTOLAYOUT_TITLE_VCONTENT;
+break;
+case AUTOLAYOUT_TITLE_2VTEXT:
+retstr=AUTOLAYOUT_TITLE_2VTEXT;
+break;
default:
retstr=unknown;
break;
@@ -1238,7 +1247,7 @@ rtl::OUString enumtoString(AutoLayout aut)
return retstr;
}
-static void CalcAutoLayoutRectangles( SdPage rPage, int nLayout, Rectangle*
rRectangle ,const rtl::OUString autolayout)
+static void CalcAutoLayoutRectangles( SdPage rPage,Rectangle* rRectangle
,const rtl::OUString autolayout)
{
Rectangle aTitleRect;
Rectangle aLayoutRect;
@@ -1283,10 +1292,9 @@ static void CalcAutoLayoutRectangles( SdPage rPage, int
nLayout, Rectangle* rRe
SizeaTempSize;
Point aTempPnt;
aTempSize = aLayoutSize;
-aTempPnt = aLayoutPos;
-sal_BoolbRightToLeft = ( rPage.GetModel() static_cast
SdDrawDocument* ( rPage.GetModel() )-GetDefaultWritingMode() ==
::com::sun::star::text::WritingMode_RL_TB );
+aTempPnt = aLayoutPos;
-std::vectorReferenceXNode layoutinfo = static_cast SdDrawDocument*
( rPage.GetModel() )-GetLayoutVector(); //getting vector from
SdDrawDocument ,not sure about the correct mechanism
+const std::vectorReferenceXNode layoutinfo = static_cast
SdDrawDocument* ( rPage.GetModel() )-GetLayoutVector(); //getting vector from
SdDrawDocument ,not sure about the correct mechanism
for(size_t y=0; y layoutinfo.size(); y++) //loop through vector of Xnodes
{
ReferenceXNode layoutnode = layoutinfo[y]; //get i'th layout
element
@@ -1351,170 +1359,6 @@ static void CalcAutoLayoutRectangles( SdPage rPage,
int nLayout, Rectangle* rRe
break;
}
}
-
-switch( nLayout )
-{
-case 0: // default layout using only the title and layout area
-break; // do nothing
-case 1: // title, 2 shapes
-case 9: // title, 2 vertical shapes
-
-// if( bRightToLeft (nLayout != 9) )
-// ::std::swap( rRectangle[1], rRectangle[2] );
-break;
-case 2: // title, shape, 2 shapes
-// aTempPnt = aLayoutPos;
-// aTempSize = aLayoutSize;
-// aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477);
-// aLayoutSize.Width() = long (aLayoutSize.Width() * 0.488);
-// aLayoutPos.X() = long (aLayoutPos.X() + aLayoutSize.Width() * 1.05);
-// rRectangle[2] = Rectangle (aLayoutPos, aLayoutSize);
-
-// aLayoutPos.Y() = long (aLayoutPos.Y() + aLayoutSize.Height() *
1.095);
-// rRectangle[3] = Rectangle (aLayoutPos, aLayoutSize);
-
-// aLayoutPos = aTempPnt;
-// aLayoutSize = aTempSize;
-// aLayoutSize.Width() = long (aLayoutSize.Width() * 0.488);
-// rRectangle[1] = Rectangle (aLayoutPos, aLayoutSize);
-
-// if( bRightToLeft )
-// {
-// ::std::swap( rRectangle[1].Left(), rRectangle[2].Left() );
-// rRectangle[3].Left() = rRectangle[2].Left();
-// }
-break;
-case 3: // title, 2 shapes, shape
-// aTempPnt = aLayoutPos;
-// aTempSize = aLayoutSize;
-// aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477);
-// aLayoutSize.Width() = long (aLayoutSize.Width() * 0.488);
-// rRectangle[1] = Rectangle (aLayoutPos, aLayoutSize);
-
-//
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/inc sd/source
sd/inc/drawdoc.hxx |4
sd/source/core/drawdoc.cxx | 10 ++
sd/source/ui/slideshow/slideshow.cxx |4 ++--
sd/source/ui/slideshow/slideshow.hrc |2 ++
sd/source/ui/slideshow/slideshow.src |5 +
sd/source/ui/slideshow/slideshowimpl.cxx | 19 +++
6 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 38f11fdb08249a6cf7140ee74016cd69f28e289a
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Wed Jul 17 17:42:15 2013 +0200
fdo#45233 Allow editing pps/ppsx Autoplay Presentations
Added a context menu Edit Presentation when in Autplay mode.
This has been discussed and approved by the Design team:
https://wiki.documentfoundation.org/Design/Meetings/2013-07-20
Change-Id: Ic229e54bd10d23f999f1d746cce38c4004504d28
Reviewed-on: https://gerrit.libreoffice.org/4998
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Reviewed-by: Tor Lillqvist t...@iki.fi
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 77ac6b6..cb0e758 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -164,6 +164,7 @@ private:
sal_BoolmbOnlineSpell;
sal_BoolmbSummationOfParagraphs;
boolmbStartWithPresentation;/// is set to true
when starting with command line parameter -start
+boolmbExitAfterPresenting = false; /// true if
mbStartWithPresentation AND Presentation was shown fully
LanguageTypemeLanguage;
LanguageTypemeLanguageCJK;
LanguageTypemeLanguageCTL;
@@ -258,6 +259,9 @@ public:
bool IsStartWithPresentation() const;
void SetStartWithPresentation( bool bStartWithPresentation );
+bool IsExitAfterPresenting() const;
+void SetExitAfterPresenting( bool bExitAfterPresenting );
+
/** Insert pages into this document
This method inserts whole pages into this document, either
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 2d294eb..07dda03 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -936,6 +936,16 @@ void SdDrawDocument::SetStartWithPresentation( bool
bStartWithPresentation )
mbStartWithPresentation = bStartWithPresentation;
}
+bool SdDrawDocument::IsExitAfterPresenting() const
+{
+return mbExitAfterPresenting;
+}
+
+void SdDrawDocument::SetExitAfterPresenting( bool bExitAfterPresenting )
+{
+mbExitAfterPresenting = bExitAfterPresenting;
+}
+
void SdDrawDocument::PageListChanged()
{
mpDrawPageListWatcher-Invalidate();
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 50a93e5..5213724 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -802,9 +802,9 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
}
}
-if( pViewShell-GetDoc()-IsStartWithPresentation() )
+if( pViewShell-GetDoc()-IsExitAfterPresenting() )
{
-pViewShell-GetDoc()-SetStartWithPresentation( false );
+pViewShell-GetDoc()-SetExitAfterPresenting( false );
Referenceframe::XDispatchProvider
xProvider(pViewShell-GetViewShellBase().GetController()-getFrame(),
UNO_QUERY);
diff --git a/sd/source/ui/slideshow/slideshow.hrc
b/sd/source/ui/slideshow/slideshow.hrc
index 98a058b..4e6169f 100644
--- a/sd/source/ui/slideshow/slideshow.hrc
+++ b/sd/source/ui/slideshow/slideshow.hrc
@@ -41,6 +41,8 @@
#define CM_WIDTH_PEN_VERY_THICK 17
#define CM_PEN_MODE 18
+#define CM_EDIT_PRESENTATION 19
+
#define CM_SLIDES 21 // this must be the last id!
#endif
diff --git a/sd/source/ui/slideshow/slideshow.src
b/sd/source/ui/slideshow/slideshow.src
index 324ec09..480cc09 100644
--- a/sd/source/ui/slideshow/slideshow.src
+++ b/sd/source/ui/slideshow/slideshow.src
@@ -142,6 +142,11 @@ Menu RID_SLIDESHOW_CONTEXTMENU
};
MenuItem
{
+Identifier = CM_EDIT_PRESENTATION ;
+Text [ en-US ] = E~dit Presentation ;
+};
+MenuItem
+{
Identifier = CM_ENDSHOW ;
Text [ en-US ] = ~End Show ;
};
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6f67a1b..b096dc4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -897,6 +897,11 @@ bool SlideshowImpl::startShow( PresentationSettingsEx*
pPresSettings )
if (mpParentWindow == NULL)
return false;
+// Autoplay
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |4
++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 63162c960ae6f0d70740a6bba2cf225d2d8d3688
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Aug 13 11:01:54 2013 +0200
Fix fdo#67908 - keep Visual around until after GL context is created.
Change-Id: Ie84decdccfa5bbf44c9cb05e2c2229f7384c1912
Reviewed-on: https://gerrit.libreoffice.org/5386
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 65c992a..23c10a0 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -578,7 +578,6 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
vi = glXGetVisualFromFBConfig( GLWin.dpy, fbconfigs[i] );
mbHasTFPVisual = true;
pChildSysData = lcl_createSystemWindow( vi, pPWindow, pWindow
);
-XFree ( vi );
SAL_INFO(slideshow.opengl, found visual suitable for
texture_from_pixmap);
} else if( firstVisual pAttributeTable[1] == NULL ) {
vi = firstVisual;
@@ -599,7 +598,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
}
#if defined( GLX_VERSION_1_3 ) defined( GLX_EXT_texture_from_pixmap )
-if ( firstVisual )
+if ( firstVisual vi != firstVisual )
XFree (firstVisual);
#endif
@@ -681,6 +680,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView(
const Reference presenta
GLWin.vi,
0,
GL_TRUE);
+XFree ( GLWin.vi );
if( GLWin.ctx == NULL ) {
SAL_INFO(slideshow.opengl, unable to create GLX context);
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9b6e7e72ebd6a9b308fd012b242cd29152407faa Author: Jesús Corrius jcorr...@gmail.com Date: Tue Aug 13 12:47:06 2013 +0200 AppUserModelIDs registry entries are useful only on Windows7+ Change-Id: Ia17608d603434fa244c056bf711ce4951644246e Reviewed-on: https://gerrit.libreoffice.org/5385 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 25e0f41..6a4b19a 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -239,7 +239,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = VersionNT = 600; \ +ComponentCondition = VersionNT = 601; \ Subkey = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 include/sfx2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
helpcontent2 |2
include/sfx2/tabdlg.hxx |5
sw/UIConfig_swriter.mk|1
sw/inc/envelp.hrc |8 -
sw/inc/globals.hrc|3
sw/inc/helpid.h |1
sw/inc/swabstdlg.hxx |6 -
sw/source/ui/app/applab.cxx |2
sw/source/ui/dialog/swdlgfact.cxx | 23 ---
sw/source/ui/dialog/swdlgfact.hxx |8 -
sw/source/ui/envelp/envelp.src|4
sw/source/ui/envelp/envlop.hrc| 11 -
sw/source/ui/envelp/envlop.src|5
sw/source/ui/envelp/label.hrc |5
sw/source/ui/envelp/label.src | 69 ---
sw/source/ui/envelp/label1.cxx| 62 +-
sw/source/ui/inc/label.hxx| 18 +--
sw/uiconfig/swriter/ui/labeldialog.ui | 203 ++
18 files changed, 266 insertions(+), 170 deletions(-)
New commits:
commit 7b763893e4c2571f1d8c8afef5491e0e73bff3ea
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 13 14:51:54 2013 +0100
convert label dialog to .ui
Change-Id: I77ce740b1ca7178d8c5f5f2d4ce55920cf18a85b
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 9d31183..1d4f534 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -197,6 +197,11 @@ public:
{
return m_pTabCtrl-GetCurPageId();
}
+OUStringGetPageText( sal_uInt16 nPageId ) const
+{
+return m_pTabCtrl-GetPageText(nPageId);
+}
+
voidShowPage( sal_uInt16 nId );
// may provide local slots converted by Map
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 05f118a..96447e4 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -105,6 +105,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertsectiondialog \
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
+ sw/uiconfig/swriter/ui/labeldialog \
sw/uiconfig/swriter/ui/labelformatpage \
sw/uiconfig/swriter/ui/labeloptionspage \
sw/uiconfig/swriter/ui/linenumbering \
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index 6fb5624..ae75783 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -33,10 +33,6 @@
#define TP_ENV_FMT (RC_ENVELP_BEGIN + 3)
#define TP_ENV_PRT (RC_ENVELP_BEGIN + 4)
-#define TP_LAB_LAB (RC_ENVELP_BEGIN + 5)
-#define TP_LAB_FMT (RC_ENVELP_BEGIN + 6)
-#define TP_LAB_PRT (RC_ENVELP_BEGIN + 7)
-
#define DLG_MAILMERGE (RC_ENVELP_BEGIN + 8)
#define DLG_SYNC_BTN (RC_ENVELP_BEGIN + 9)
@@ -58,9 +54,6 @@
#define RC_LABFMT_BEGIN (RC_ENVELP_BEGIN + 50)
#define RC_LABFMT_END(RC_ENVELP_BEGIN + 62)
-// RC_LABPRT_BEGIN (RC_ENVELP_BEGIN + 63)
-#define RC_LABPRT_END(RC_ENVELP_BEGIN + 72)
-
// Strings
#define STR_DATABASE_NOT_OPENED (RC_ENVLOP_BEGIN + 63)
@@ -68,7 +61,6 @@
#define DLG_MERGE_FIELD_CONNECTIONS (RC_ENVLOP_BEGIN + 66)
-#define STR_BTN_NEW_DOC (RC_ENVLOP_BEGIN + 67)
#define STR_BTN_NEWDOC (RC_ENVLOP_BEGIN + 68)
#define STR_SENDER_TOKENS(RC_ENVLOP_BEGIN + 69)
// Ueberlaufpruefung --
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 1d11797..2eb0020 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -176,10 +176,7 @@
#define TP_TOX_SELECT (RC_GLOBALS_BEGIN + 90)
#define TP_TOX_ENTRY(RC_GLOBALS_BEGIN + 91)
#define TP_TOX_STYLES (RC_GLOBALS_BEGIN + 92)
-#define TP_VISITING_CARDS (RC_GLOBALS_BEGIN + 93)
#define DLG_ADD_IDX_STYLES (RC_GLOBALS_BEGIN + 94)
-#define TP_PRIVATE_DATA (RC_GLOBALS_BEGIN + 95)
-#define TP_BUSINESS_DATA(RC_GLOBALS_BEGIN + 96)
#define TP_OPTCOMPATIBILITY_PAGE(RC_GLOBALS_BEGIN + 103)
#define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104)
//maximum: RC_GLOBALS_BEGIN + 120
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 751430f..918bba2 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -330,7 +330,6 @@
#define HID_DRAW_TEXT_TOOLBOX
SW_HID_DRAW_TEXT_TOOLBOX
#define HID_NUM_TOOLBOX
SW_HID_NUM_TOOLBOX
-#define HID_LABEL_INSERT
SW_HID_LABEL_INSERT
#define HID_CALC_TOOLBOX
SW_HID_CALC_TOOLBOX
#define HID_PVIEW_TOOLBOX
SW_HID_PVIEW_TOOLBOX
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 1d372b2..b0578c1 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -247,7 +247,7 @@ public:
class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg
{
public:
- virtual const String
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |1 - source/text/shared/01/01010200.xhp |6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit b920cf6a9a000a8bef4280ba89b347585a3e63e6 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 15:30:54 2013 +0100 update help ids for label dialog .ui conversion Change-Id: Ib2378ffc96093d14ad3c9a60726cd618733b diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f091b5f..dd79a87 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2294,7 +2294,6 @@ HID_IS_BTN_OK,41003, HID_JOINSH_ADDTAB_CLOSE,38852, HID_JOINSH_ADDTAB_QUERYLIST,38857, HID_JOINSH_ADDTAB_TABLELIST,38853, -HID_LABEL_INSERT,54839, HID_LETTER_PAGE1,53269, HID_LETTER_PAGE2,53270, HID_LETTER_PAGE3,53271, diff --git a/source/text/shared/01/01010200.xhp b/source/text/shared/01/01010200.xhp index 5fcd2f3..dea1207 100644 --- a/source/text/shared/01/01010200.xhp +++ b/source/text/shared/01/01010200.xhp @@ -32,7 +32,7 @@ /meta body bookmark xml-lang=en-US branch=hid/.uno:InsertLabels id=bm_id6021898 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:InsertLabels id=bm_id3153255 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/labeldialog/LabelDialog id=bm_id3153255 localize=false/ paragraph role=heading id=hd_id3154788 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/01010200.xhp name=LabelsLabels/link/paragraph paragraph role=paragraph id=par_id3145071 xml-lang=en-US l10n=U oldref=2variable id=etikettahelp hid=.uno:InsertLabelsAllows you to create labels. Labels are created in a text document./ahelp You can print labels using a pre-defined or a custom paper format. /variable/paragraph @@ -43,9 +43,9 @@ embed href=text/shared/01/01010201.xhp#etiketten/ embed href=text/shared/01/01010202.xhp#format/ embed href=text/shared/01/01010203.xhp#drucker/ -bookmark xml-lang=en-US branch=hid/SW_HID_LABEL_INSERT id=bm_id3166460 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/labeldialog/ok id=bm_id3166460 localize=false/ paragraph role=heading id=hd_id3145383 xml-lang=en-US level=2 l10n=U oldref=7New Document/paragraph -paragraph role=paragraph id=par_id3154810 xml-lang=en-US l10n=U oldref=8ahelp hid=HID_LABEL_INSERTCreates a new document for editing./ahelp/paragraph +paragraph role=paragraph id=par_id3154810 xml-lang=en-US l10n=U oldref=8ahelp hid=modules/swriter/ui/labeldialog/okCreates a new document for editing./ahelp/paragraph embed href=text/shared/00/0001.xhp#zurueck/ section id=relatedtopics paragraph role=paragraph id=par_id3144438 xml-lang=en-US l10n=Clink href=text/shared/guide/labels.xhp name=Creating labelsCreating labels/link/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: src/docrecord.py
src/docrecord.py |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 5059deec7da8df4ab9e0c61e812bea1f479781d6 Author: Miklos Vajna vmik...@suse.cz Date: Tue Aug 13 17:31:32 2013 +0200 dump sprmPBrcTop/Left/Bottom/Right diff --git a/src/docrecord.py b/src/docrecord.py index ac8b8f5..660c073 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -1122,7 +1122,9 @@ class Sprm(DOCDirStream): elif self.getOperandSize() == 7: self.operand = self.getuInt64() 0x0fff elif self.getOperandSize() == 9: -if self.sprm in (0xd234, 0xd235, 0xd236, 0xd237): +# top, left, bottom and right page / paragraph borders +if self.sprm in (0xd234, 0xd235, 0xd236, 0xd237, +0xc64e, 0xc64f, 0xc650, 0xc651): self.ct = BrcOperand(self) elif self.sprm == 0xc60d: self.ct = PChgTabsPapxOperand(self) @@ -1133,7 +1135,7 @@ class Sprm(DOCDirStream): elif self.sprm == 0xca47: self.ct = CMajorityOperand(self) else: -print 'todo what=Sprm::__init__() unhandled sprm of size 9/' +print 'todo what=Sprm::__init__() unhandled sprm of size 9: %s/' % hex(self.sprm) else: if self.sprm == 0xd608: self.ct = TDefTableOperand(self) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e8/c93cc8f28debdcb271030f9466de806e863824
e8/c93cc8f28debdcb271030f9466de806e863824 |1 + 1 file changed, 1 insertion(+) New commits: commit 28fa100455c30d6b8154c75be86211b68c81dac5 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 16:33:14 2013 +0100 Notes added by 'git notes add' diff --git a/e8/c93cc8f28debdcb271030f9466de806e863824 b/e8/c93cc8f28debdcb271030f9466de806e863824 new file mode 100644 index 000..d1a287a --- /dev/null +++ b/e8/c93cc8f28debdcb271030f9466de806e863824 @@ -0,0 +1 @@ +merged as: 12a9b47ec2a892a9c5606a16396992fb6553d7eb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fmtclds.hxx|6 +-
sw/source/core/layout/atrfrm.cxx |7 ++-
sw/source/filter/ww8/wrtw8sty.cxx | 12 +++-
sw/source/filter/ww8/ww8atr.cxx |3 +++
4 files changed, 25 insertions(+), 3 deletions(-)
New commits:
commit 12a9b47ec2a892a9c5606a16396992fb6553d7eb
Author: Jian Hong Cheng chen...@apache.org
Date: Tue Sep 4 08:39:06 2012 +
Resolves: #i120133# Doc file saved by Office, section size changed
* sw/inc/fmtclds.hxx
* sw/source/core/layout/atrfrm.cxx
* sw/source/filter/ww8/wrtw8sty.cxx
* sw/source/filter/ww8/ww8atr.cxx
MS Word Binary compatibility
Patch by: Chen Peng,chenpeng2...@gmail.com
Found by: Yan Ji,yanji...@gmail.com
Review by: Jian Hong Cheng,chen...@apache.org
(cherry picked from commit e8c93cc8f28debdcb271030f9466de806e863824)
Conflicts:
sw/inc/fmtclds.hxx
sw/source/core/layout/atrfrm.cxx
Change-Id: Ifbda61cc37933778e3fdad79fb6ee88f9b3cf916
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index e8c0b51..71f039a 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -79,7 +79,8 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
SwColLineAdj eAdj; /// Line will be adjusted top,
centered or bottom.
SwColumns aColumns; /// Information concerning the
columns.
-sal_uInt16 nWidth; /// Total desired width of all
columns.
+sal_uInt16 nWidth; /// Total desired width of all
columns.
+sal_Int16 aWidthAdjustValue;
sal_Bool bOrtho;/** Only if this flag is set, the setting of
GutterWidth will
be accompanied by a visual rearrangement.
@@ -93,6 +94,9 @@ public:
SwFmtCol();
SwFmtCol( const SwFmtCol );
~SwFmtCol();
+//#i120133#
+sal_Int16 GetAdjustValue() const { return aWidthAdjustValue; }
+void SetAdjustValue( const sal_Int16 n ) { aWidthAdjustValue = n; }
SwFmtCol operator=( const SwFmtCol );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index cd72779..2528806 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -751,6 +751,7 @@ SwFmtCol::SwFmtCol( const SwFmtCol rCpy )
eAdj( rCpy.GetLineAdj() ),
aColumns( (sal_Int8)rCpy.GetNumCols() ),
nWidth( rCpy.GetWishWidth() ),
+aWidthAdjustValue( rCpy.aWidthAdjustValue ),
bOrtho( rCpy.IsOrtho() )
{
for ( sal_uInt16 i = 0; i rCpy.GetNumCols(); ++i )
@@ -770,6 +771,7 @@ SwFmtCol SwFmtCol::operator=( const SwFmtCol rCpy )
nLineHeight = rCpy.GetLineHeight();
eAdj= rCpy.GetLineAdj();
nWidth = rCpy.GetWishWidth();
+aWidthAdjustValue = rCpy.aWidthAdjustValue;
bOrtho = rCpy.IsOrtho();
if ( !aColumns.empty() )
@@ -790,6 +792,7 @@ SwFmtCol::SwFmtCol()
nLineHeight( 100 ),
eAdj( COLADJ_NONE ),
nWidth( USHRT_MAX ),
+aWidthAdjustValue( 0 ),
bOrtho( sal_True )
{
}
@@ -805,7 +808,9 @@ int SwFmtCol::operator==( const SfxPoolItem rAttr ) const
eAdj == rCmp.GetLineAdj()
nWidth == rCmp.GetWishWidth()
bOrtho == rCmp.IsOrtho()
- aColumns.size() == rCmp.GetNumCols()) )
+ aColumns.size() == rCmp.GetNumCols()
+ aWidthAdjustValue == rCmp.GetAdjustValue()
+ ) )
return 0;
for ( sal_uInt16 i = 0; i aColumns.size(); ++i )
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 3af5046..5afe2d8 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1581,7 +1581,6 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
// am Nachkommen NUR die Spaltigkeit gemaess Sect-Attr.
// umsetzen
-aSet.Put( rSepInfo.pSectionFmt-GetFmtAttr( RES_COL ) );
const SvxLRSpaceItem rSectionLR =
ItemGetSvxLRSpaceItem( *(rSepInfo.pSectionFmt), RES_LR_SPACE
);
@@ -1591,6 +1590,17 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo rSepInfo, WW8_PdAtt
SvxLRSpaceItem aResultLR( rPageLR.GetLeft() +
rSectionLR.GetLeft(), rPageLR.GetRight() +
rSectionLR.GetRight(), 0, 0, RES_LR_SPACE );
+//i120133: The Section width should consider section indent value.
+if (rSectionLR.GetLeft()+rSectionLR.GetRight()!=0)
+{
+const SwFmtCol rCol = dynamic_castconst
SwFmtCol(rSepInfo.pSectionFmt-GetFmtAttr(RES_COL));
+SwFmtCol aCol(rCol);
+
aCol.SetAdjustValue(rSectionLR.GetLeft()+rSectionLR.GetRight());
+aSet.Put(aCol);
+}
+else
+aSet.Put(rSepInfo.pSectionFmt-GetFmtAttr(RES_COL));
+
aSet.Put( aResultLR );
diff
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 49/60217394334be14d6d7172119cee7c8e78479f
49/60217394334be14d6d7172119cee7c8e78479f |1 + 1 file changed, 1 insertion(+) New commits: commit cf33f74c4221766dc72fd58d9929a8ea860e6257 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 16:33:52 2013 +0100 Notes added by 'git notes add' diff --git a/49/60217394334be14d6d7172119cee7c8e78479f b/49/60217394334be14d6d7172119cee7c8e78479f new file mode 100644 index 000..dc5b0db --- /dev/null +++ b/49/60217394334be14d6d7172119cee7c8e78479f @@ -0,0 +1 @@ +prefer: 12a9b47ec2a892a9c5606a16396992fb6553d7eb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/para-shadow.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx | 16
writerfilter/source/dmapper/DomainMapper.cxx |6 ++
writerfilter/source/dmapper/PropertyIds.cxx|1 +
writerfilter/source/dmapper/PropertyIds.hxx|1 +
writerfilter/source/dmapper/PropertyMap.cxx| 22 ++
writerfilter/source/dmapper/PropertyMap.hxx|2 ++
8 files changed, 44 insertions(+), 16 deletions(-)
New commits:
commit 65afb07d56e8faf0cf020de784747046cbcb9d0e
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 13 15:20:24 2013 +0200
DOCX export of paragraph border drop shadow
Instead of passing over shadow location only in case of page borders, do
the same for paragraph borders as well.
Change-Id: I311638fe0f41ef47ae351f7d199bfbc8b8aabfbe
diff --git a/sw/qa/extras/ooxmlexport/data/para-shadow.docx
b/sw/qa/extras/ooxmlexport/data/para-shadow.docx
new file mode 100755
index 000..d35d5f9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/para-shadow.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0b4003e..fc55bb9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -106,6 +106,7 @@ public:
void testFdo65718();
void testFdo64350();
void testFdo67013();
+void testParaShadow();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -188,6 +189,7 @@ void Test::run()
{fdo65718.docx, Test::testFdo65718},
{fdo64350.docx, Test::testFdo64350},
{fdo67013.docx, Test::testFdo67013},
+{para-shadow.docx, Test::testParaShadow},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1134,6 +1136,16 @@ void Test::testFdo67013()
CPPUNIT_ASSERT_EQUAL(sal_Int16(106), aFooterTopBorder.OuterLineWidth);
}
+void Test::testParaShadow()
+{
+// The problem was that in w:pBdr, child elements had a w:shadow
attribute, but that was ignored.
+table::ShadowFormat aShadow =
getPropertytable::ShadowFormat(getParagraph(2), ParaShadowFormat);
+CPPUNIT_ASSERT_EQUAL(COL_BLACK, sal_uInt32(aShadow.Color));
+CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, aShadow.Location);
+// w:sz=48 is in eights of a point, 1 pt is 20 twips.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(TWIP_TO_MM100(24/8*20)),
aShadow.ShadowWidth);
+}
+
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 55de9c9..51caae9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5125,6 +5125,14 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem
rBox )
OutputBorderOptions aOutputBorderOptions = lcl_getBoxBorderOptions();
+// Check if there is a shadow item
+const SfxPoolItem* pItem = GetExport().HasItem( RES_SHADOW );
+if ( pItem )
+{
+const SvxShadowItem* pShadowItem = (const SvxShadowItem*)pItem;
+aOutputBorderOptions.aShadowLocation = pShadowItem-GetLocation();
+}
+
if ( m_bOpenedSectPr GetWritingHeaderFooter() == false)
{
@@ -5133,14 +5141,6 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem
rBox )
// Check if the distance is larger than 31 points
aOutputBorderOptions.bCheckDistanceSize = true;
-// Check if there is a shadow item
-const SfxPoolItem* pItem = GetExport().HasItem( RES_SHADOW );
-if ( pItem )
-{
-const SvxShadowItem* pShadowItem = (const SvxShadowItem*)pItem;
-aOutputBorderOptions.aShadowLocation = pShadowItem-GetLocation();
-}
-
impl_borders( m_pSerializer, rBox, aOutputBorderOptions,
m_pageMargins );
// Special handling for pgBorder
commit 590751d98e10867609c45fff93edae53dfaef3a8
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 13 15:09:12 2013 +0200
DOCX import of paragraph border drop shadow
Change-Id: I566c491d65b65def65b78afb583624d8272027e0
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ee863fa..51f43c7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -29,6 +29,7 @@
#include ooxml/OOXMLFastTokens.hxx
#include com/sun/star/document/XDocumentPropertiesSupplier.hpp
#include com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp
+#include com/sun/star/table/ShadowFormat.hpp
#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/VertOrientation.hpp
@@ -1797,6 +1798,11 @@ void DomainMapper::sprmWithProps(
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/inc basegfx/source sc/source vcl/source vcl/win
basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx|6
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx |5
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |5
basegfx/inc/basegfx/tuple/b2dtuple.hxx |4
basegfx/inc/basegfx/tuple/b3dtuple.hxx |4
basegfx/source/matrix/b2dhommatrixtools.cxx | 41 ++
basegfx/source/polygon/b2dpolygon.cxx |2
basegfx/source/polygon/b2dpolygontools.cxx | 33 +
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 77 +++-
basegfx/source/polygon/b2dpolypolygontools.cxx | 17 ++
sc/source/ui/inc/output.hxx |2
sc/source/ui/view/gridwin.cxx |8 -
sc/source/ui/view/output.cxx| 36 +++--
vcl/source/gdi/region.cxx |5
vcl/win/source/gdi/salgdi.cxx | 127 ++--
15 files changed, 283 insertions(+), 89 deletions(-)
New commits:
commit 4ccb1eb7d58005ab3b501b7c6ff128fadbcd5066
Author: Armin Le Grand a...@apache.org
Date: Tue Aug 13 15:10:34 2013 +
i122149 Corrected stuff around polygon-based clip regions, do not use them
where nt needed
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
index 267cf57..45422e2 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
@@ -27,6 +27,7 @@
#include sal/types.h
#include basegfx/matrix/b2dhommatrix.hxx
#include basegfx/vector/b2dvector.hxx
+#include basegfx/range/b2drange.hxx
namespace rtl { class OUString; }
@@ -131,6 +132,11 @@ namespace basegfx
fRadiant);
}
+/// special for the case to map from source range to target range
+B2DHomMatrix createSourceRangeTargetRangeTransform(
+const B2DRange rSourceRange,
+const B2DRange rTargetRange);
+
} // end of namespace tools
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index 592ab4b..721779a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -527,6 +527,11 @@ namespace basegfx
*/
B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon
rCandidate);
+/** returns true if the Polygon only contains horizontal or vertical
edges
+so that it could be represented by RegionBands
+*/
+bool containsOnlyHorizontalAndVerticalEdges(const B2DPolygon
rCandidate);
+
} // end of namespace tools
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 7a602ef..5fcf90a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -275,6 +275,11 @@ namespace basegfx
*/
B2DPolyPolygon snapPointsOfHorizontalOrVerticalEdges(const
B2DPolyPolygon rCandidate);
+/** returns true if the Polygon only contains horizontal or vertical
edges
+so that it could be represented by RegionBands
+*/
+bool containsOnlyHorizontalAndVerticalEdges(const B2DPolyPolygon
rCandidate);
+
} // end of namespace tools
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
index 152518e..ee3240f 100644
--- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
@@ -220,12 +220,12 @@ namespace basegfx
bool operator==( const B2DTuple rTup ) const
{
-return equal(rTup);
+return mfX == rTup.mfX mfY == rTup.mfY;
}
bool operator!=( const B2DTuple rTup ) const
{
-return !equal(rTup);
+return mfX != rTup.mfX || mfY != rTup.mfY;
}
B2DTuple operator=( const B2DTuple rTup )
diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx
b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
index bceae5b..0e9f747 100644
--- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
@@ -252,12 +252,12 @@ namespace basegfx
bool operator==( const B3DTuple rTup ) const
{
-return equal(rTup);
+return mfX == rTup.mfX mfY == rTup.mfY mfZ == rTup.mfZ;
}
bool operator!=( const B3DTuple rTup ) const
{
-return !equal(rTup);
+return mfX != rTup.mfX || mfY != rTup.mfY || mfZ != rTup.mfZ;
}
B3DTuple operator=( const B3DTuple rTup )
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx
b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 7ce6be5..e6c5560 100644
---
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 63/3e51119e70ca29cf5eea6a661ca7c71a85005c
63/3e51119e70ca29cf5eea6a661ca7c71a85005c |1 + 1 file changed, 1 insertion(+) New commits: commit abc86d6916e43cf5298de6dab7b5e75a62ecb9c5 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 13 16:36:10 2013 +0100 Notes added by 'git notes add' diff --git a/63/3e51119e70ca29cf5eea6a661ca7c71a85005c b/63/3e51119e70ca29cf5eea6a661ca7c71a85005c new file mode 100644 index 000..8a2345e --- /dev/null +++ b/63/3e51119e70ca29cf5eea6a661ca7c71a85005c @@ -0,0 +1 @@ +ignore: fixed ___ 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/core/docnode/nodes.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit ebc81f19ef4ffe8d54f83c019ea80d10c98647d7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 13 18:13:49 2013 +0200
fdo#68064: Do not insert aTempEntry multiple times
...and do not let it go out of scope before being used in
BigPtrArray::Remove.
(And, en passant, avoid use of reserved identifier, starting with an
underscore
followed by a capital letter.)
Change-Id: Ic5730f707601a2070f2eed3ba017650026657df3
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 61c3098..4c02bf0 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -2323,11 +2323,14 @@ void SwNodes::ForEach( const SwNodeIndex rStart, const
SwNodeIndex rEnd,
(FnForEach) fnForEach, pArgs );
}
-struct _TempBigPtrEntry : public BigPtrEntry
+namespace {
+
+struct TempBigPtrEntry : public BigPtrEntry
{
-_TempBigPtrEntry() {}
+TempBigPtrEntry() {}
};
+}
void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, sal_Bool bDel )
{
@@ -2371,6 +2374,7 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong
nSz, sal_Bool bDel )
}
}
+std::vectorTempBigPtrEntry aTempEntries;
if( bDel )
{
sal_uLong nCnt = nSz;
@@ -2383,14 +2387,14 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong
nSz, sal_Bool bDel )
// ablaueft, wird hier ein temp. Objekt eingefuegt, das
// dann mit dem Remove wieder entfernt wird.
// siehe Bug 55406
-_TempBigPtrEntry aTempEntry;
-BigPtrEntry* pTempEntry = aTempEntry;
+aTempEntries.resize(nCnt);
while( nCnt-- )
{
delete pDel;
pDel = pPrev;
sal_uLong nPrevNdIdx = pPrev-GetIndex();
+BigPtrEntry* pTempEntry = aTempEntries[nCnt];
BigPtrArray::Replace( nPrevNdIdx+1, pTempEntry );
if( nCnt )
pPrev = (*this)[ nPrevNdIdx - 1 ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67799, which changed state. Bug 67799 Summary: MAILMERGE: Pre-Defined Labels Contain No Format Info in LO 4.1.0.4 https://bugs.freedesktop.org/show_bug.cgi?id=67799 What|Removed |Added Status|NEW |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: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source cui/source cui/uiconfig include/basic officecfg/registry
basctl/source/basicide/baside2b.cxx | 56 ---
basic/source/classes/codecompletecache.cxx |2
basic/source/classes/sbxmod.cxx |5
basic/source/comp/parser.cxx |1
basic/source/comp/token.cxx | 21
basic/source/inc/token.hxx |1
cui/source/options/optbasic.cxx | 14 +-
cui/source/options/optbasic.hxx |2
cui/uiconfig/ui/optbasicidepage.ui |5
include/basic/sbmod.hxx |1
officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs |4
11 files changed, 87 insertions(+), 25 deletions(-)
New commits:
commit 2795bc817f1e783570c28428cec8e07b35cce7bb
Author: Gergo Mocsi gmocs...@gmail.com
Date: Tue Aug 13 18:11:26 2013 +0200
GSOC work, behavior fixes
Code completition: left/right arrow keys handled. Left arrow dismisses the
dialog when reaches the dot. Right arrow dismissed the dialog when reaches the
next line.
ListBox appearance fixed.
TAB key can insert the first matching entry.
Autocorrect:
Autocorrect Keywords has been renamed to Autcorrect (in the UI, and the
config file, after this patch a make dev-install is needed). Keyword case
correction is not just capitalizing the first letter ( eg. Elseif - ElseIf ).
Autoclose procedures:
cursor is being placed inside the preocedure.
Change-Id: Ie7e9ae96b49bd94562db83f96e1c4ad63ab3f3d6
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 49f9058..c0c4046 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -530,8 +530,7 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
HandleProcedureCompletition();
}
-if( rKEvt.GetKeyCode().GetCode() == KEY_POINT
-(CodeCompleteOptions::IsCodeCompleteOn() ||
CodeCompleteOptions::IsExtendedTypeDeclaration()) )
+if( rKEvt.GetKeyCode().GetCode() == KEY_POINT
CodeCompleteOptions::IsCodeCompleteOn() )
{
HandleCodeCompletition();
}
@@ -596,9 +595,13 @@ void EditorWindow::HandleAutoCorrect()
OUString sStr = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
if( !sStr.isEmpty() )
{
-//capitalize first letter and replace
sStr = sStr.toAsciiLowerCase();
-sStr = sStr.replaceAt( 0, 1, OUString(sStr[0]).toAsciiUpperCase()
);
+if( !rModulWindow.GetSbModule()-GetKeywordCase(sStr).isEmpty() )
+// if it is a keyword, get its correct case
+sStr = rModulWindow.GetSbModule()-GetKeywordCase(sStr);
+else
+// else capitalize first letter/select the correct one, and replace
+sStr = sStr.replaceAt( 0, 1,
OUString(sStr[0]).toAsciiUpperCase() );
TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
@@ -684,13 +687,17 @@ void EditorWindow::HandleProcedureCompletition()
return;// no sub/function keyword or there is no identifier
OUString sText(\nEnd );
+aSel = GetEditView()-GetSelection();
if( sProcType.equalsIgnoreAsciiCase(function) )
sText += OUString( Function\n );
if( sProcType.equalsIgnoreAsciiCase(sub) )
sText += OUString( Sub\n );
if( nLine+1 == pEditEngine-GetParagraphCount() )
+{
pEditView-InsertText( sText );//append to the end
+GetEditView()-SetSelection(aSel);
+}
else
{
for( sal_uLong i = nLine+1; i pEditEngine-GetParagraphCount(); ++i )
@@ -708,7 +715,8 @@ void EditorWindow::HandleProcedureCompletition()
{
if( sStr.equalsIgnoreAsciiCase(sub) ||
sStr.equalsIgnoreAsciiCase(function) )
{
-pEditView-InsertText( sText );
+pEditView-InsertText( sText );//append to the end
+GetEditView()-SetSelection(aSel);
break;
}
if( sStr.equalsIgnoreAsciiCase(end) )
@@ -729,15 +737,16 @@ void EditorWindow::HandleCodeCompletition()
std::vector OUString aVect; //vector to hold the base variable+methods
for the nested reflection
HighlightPortions aPortions;
+aLine = aLine.copy(0, aSel.GetEnd().GetIndex());
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
if( aPortions.size() 0 )
{//use the syntax highlighter to grab out nested reflection calls, eg.
aVar.aMethod(aa).aOtherMethod ..
-for( auto aIt = aPortions.crbegin(); aIt != aPortions.crend(); ++aIt )
+for( HighlightPortions::reverse_iterator aIt =
Introducing ProjectLibre compliment to LibreOffice and replaces Microsoft Project
Hello everyone, I wanted to introduce ProjectLibre http://www.projectlibre.org to the LibreOffice community. I have sent an email to Florian on becoming more involved with TDF. ProjectLibre is a replacement of Microsoft Project (which is a multi-billion dollar part of the Office family). There was a great article ProjectLibre edges in on Microsoft Project dominance http://opensource.com/business/13/5/projectlibre-microsoft-project We currently are being used in over 200 countries and will have a major new release in the late Fall. We are a small dedicated group. It would be wonderful to get support in promoting ProjectLibre around the world. Our major needs are getting the word out, translations, improved documentation and a website cleanup. I have known many of the LibreOffice people over the years and very pleased to see the great progress. I will help promote LibreOffice and hope we can jointly make a major impact! All the best, Marc -- *Marc O'Brien Co-Founder http://ProjectLibre.orgProjectLibre.org http://www.projectlibre.org* * **The open source replacement of Microsoft Project* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source xmloff/source
sw/inc/doc.hxx |5 ++---
sw/source/core/doc/doc.cxx | 17 ++---
xmloff/source/text/txtparae.cxx |2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 91c8008051c0bb7905a6acd822d022e144f2941f
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 13 18:39:08 2013 +0200
fdo#58040: sw: fine tune async word count
- count characters instead of paragraphs to better account for large or
small paragraphs
- start out with a relatively small value (5k chars) on the first run to
quickly show something to the user
Change-Id: Ic4013545692f267aab39e084415d5d794bb5a4ca
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 89f6c05..3e23690 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2080,13 +2080,12 @@ private:
void CopyMasterFooter(const SwPageDesc rChged, const SwFmtFooter rFoot,
SwPageDesc *pDesc, bool bLeft);
/** continue computing a chunk of document statistics
- * \param nTextNodes number of paragraphs to calculate before
- * exiting
+ * \param nChars number of characters to count before exiting
* \param bFields if stat. fields should be updated
*
* returns false when there is no more to calculate
*/
-bool IncrementalDocStatCalculate(long nTextNodes = 250, bool bFields =
true);
+bool IncrementalDocStatCalculate(long nChars, bool bFields = true);
/// Our own 'StatsUpdateTimer' calls the following method
DECL_LINK( DoIdleStatsUpdate, Timer * );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 5fe4cb6..6675507 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1648,22 +1648,25 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
// returns true while there is more to do
-bool SwDoc::IncrementalDocStatCalculate( long nTextNodes, bool bFields )
+bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields)
{
mpDocStat-Reset();
mpDocStat-nPara = 0; // default is 1!
SwNode* pNd;
// This is the inner loop - at least while the paras are dirty.
-for( sal_uLong i = GetNodes().Count(); i 0 nTextNodes 0; )
+for( sal_uLong i = GetNodes().Count(); i 0 nChars 0; )
{
switch( ( pNd = GetNodes()[ --i ])-GetNodeType() )
{
case ND_TEXTNODE:
{
+long const nOldChars(mpDocStat-nChar);
SwTxtNode *pTxt = static_cast SwTxtNode * ( pNd );
if (pTxt-CountWords(*mpDocStat, 0, pTxt-GetTxt().getLength()))
-nTextNodes--;
+{
+nChars -= (mpDocStat-nChar - nOldChars);
+}
break;
}
case ND_TABLENODE: ++mpDocStat-nTbl; break;
@@ -1738,13 +1741,13 @@ bool SwDoc::IncrementalDocStatCalculate( long
nTextNodes, bool bFields )
pType-UpdateFlds();
}
-return nTextNodes = 0;
+return nChars = 0;
}
IMPL_LINK( SwDoc, DoIdleStatsUpdate, Timer *, pTimer )
{
(void)pTimer;
-if( IncrementalDocStatCalculate( 1000 ) )
+if (IncrementalDocStatCalculate(32000))
maStatsUpdateTimer.Start();
SwView* pView = GetDocShell() ? GetDocShell()-GetView() : NULL;
@@ -1759,10 +1762,10 @@ void SwDoc::UpdateDocStat( bool bCompleteAsync, bool
bFields )
{
if (!bCompleteAsync)
{
-while (IncrementalDocStatCalculate(250, bFields)) {}
+while (IncrementalDocStatCalculate(5000, bFields)) {}
maStatsUpdateTimer.Stop();
}
-else if (IncrementalDocStatCalculate(250, bFields))
+else if (IncrementalDocStatCalculate(5000, bFields))
maStatsUpdateTimer.Start();
}
}
commit 9e2351ffd9dc7876c1071e5b6eed10ba9aaae2cd
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 13 16:06:01 2013 +0200
XMLTextParagraphExport: not finding auto style means data loss
... so use assert() to get attention for such problems.
Change-Id: I4aea1a1cb5ad497583024b326f27fb73e5be9bb7
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 6686669..7dc6bd6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -798,7 +798,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
}
OUString sParent; // AutoStyles should not have parents!
sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent,
xPropStates );
-DBG_ASSERT( !sName.isEmpty(), AutoStyle could not be found );
+assert(!sName.isEmpty()); // AutoStyle could not be found
rbHasAutoStyle = sal_True;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Introducing ProjectLibre compliment to LibreOffice and replaces Microsoft Project
Hi Marc, I have a few questions, if I may: [Preamble : although the questions are direct and may sound harsh or even hostile, rest assured that I'm genuinely interested by the answers and I have no preset mind wrt to the wisdom of ProjectLibre joining TDF. But that would be a big step for both party so I feel it would be best to better understand the situation. ] 1/ What is your objective wrt to joining TDF. what, except a partial name overlap with LibreOffice, is the common denominator. In particular how does ProjectLibre promote the [...]use of open document formats and open standards (TDF Manifesto) 2/ What happened to OpenProj... and what are the indications that a similar fate is unlikely for ProjectLibre. 3/ What would be your goals/need/wants, wrt to infrastructure: hosting of git repo, gerrit, jenkins, bugzilla, tinderbox, ML, wiki, etc... 4/ peeking at the source, I may have missed things, but it appears to me that the level of activity is very low, with most of the coding being apparently pretty much a one-man operation for the last few month. how is that going to scale ? I means, your master branch has seen 85 commit in 12 month... 70-75 of them by a single person. For perspective, 80 commits is what we see on a weekday in libreoffice's core repo. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgsvgnode.hxx | 10
svgio/inc/svgio/svgreader/svgtools.hxx |8
svgio/source/svgreader/svgcirclenode.cxx |2
svgio/source/svgreader/svgsvgnode.cxx| 459 +++
svgio/source/svgreader/svgtools.cxx | 65 +++-
5 files changed, 418 insertions(+), 126 deletions(-)
New commits:
commit 8a9164f5f853db66b4453fc6fb798acf0a88a238
Author: Armin Le Grand a...@apache.org
Date: Tue Aug 13 16:58:52 2013 +
i122600 Added patch from Regina that fixes a bunch of tasks (list see in
task itself) and a reression/crash
Patch by: regina
Review by: ALG
diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx
b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
index a72fcf7..134dabe 100644
--- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
@@ -56,7 +56,15 @@ namespace svgio
virtual void parseAttribute(const rtl::OUString rTokenName,
SVGToken aSVGToken, const rtl::OUString aContent);
virtual void
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence rTarget, bool
bReferenced) const;
-/// InfoProvider support for % values
+/// Seeks width and height of viewport, which is current before
the new viewport is set.
+// needed for percentage unit in x, y, width or height
+virtual void seekReferenceWidth(double fWidth, bool bHasFound)
const;
+virtual void seekReferenceHeight(double fHeight, bool bHasFound)
const;
+
+/// InfoProvider support for % values in childs
+// The returned 'CurrentViewPort' is the viewport as it is set by
this svg element
+// and as it is needed to resolve relative values in childs
+// The method does not check for invalid width and height
virtual const basegfx::B2DRange* getCurrentViewPort() const;
/// viewBox content
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx
b/svgio/inc/svgio/svgreader/svgtools.hxx
index 3933d3b..3efc337 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -40,6 +40,9 @@ namespace svgio
void myAssert(const rtl::OUString rMessage);
#endif
+// recommended value for this devise dependend unit, see CSS2 section 4.3.2
Lenghts
+#define F_SVG_PIXEL_PER_INCH 90.0
+
// common non-token strings
struct commonStrings
{
@@ -126,7 +129,12 @@ namespace svgio
bool isPositive() const;
+// Only usable in cases, when the unit is not Unit_percent,
otherwise use method solve
+double solveNonPercentage(const InfoProvider rInfoProvider) const;
+
double solve(const InfoProvider rInfoProvider, NumberType
aNumberType = length) const;
+
+
};
typedef ::std::vector SvgNumber SvgNumberVector;
diff --git a/svgio/source/svgreader/svgcirclenode.cxx
b/svgio/source/svgreader/svgcirclenode.cxx
index e13c150..261f97c 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -128,7 +128,7 @@ namespace svgio
if(pStyle getR().isSet())
{
-const double fR(getR().solve(*this, xcoordinate));
+const double fR(getR().solve(*this, length));
if(fR 0.0)
{
diff --git a/svgio/source/svgreader/svgsvgnode.cxx
b/svgio/source/svgreader/svgsvgnode.cxx
index 95b15fb..fb46d3e 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -162,6 +162,91 @@ namespace svgio
}
}
+void SvgSvgNode::seekReferenceWidth(double fWidth, bool bHasFound)
const
+{
+if (!getParent() || bHasFound)
+{
+return;
+}
+const SvgSvgNode* pParentSvgSvgNode = 0;
+// enclosing svg might have relative width, need to cumulate them
till they are
+// resolved somewhere up in the node tree
+double fPercentage(1.0);
+for(const SvgNode* pParent = getParent(); pParent !bHasFound;
pParent = pParent-getParent())
+{
+// dynamic_cast results Null-pointer for not SvgSvgNode and so
skips them in if condition
+pParentSvgSvgNode = dynamic_cast const SvgSvgNode* (pParent);
+if (pParentSvgSvgNode)
+{
+if (pParentSvgSvgNode-getViewBox())
+{
+// viewbox values are already in 'user unit'.
+fWidth = pParentSvgSvgNode-getViewBox()-getWidth() *
fPercentage;
+bHasFound = true;
+}
+else
+{
+// take absolute value or cummulate percentage
+if (pParentSvgSvgNode-getWidth().isSet())
+
[Libreoffice-commits] core.git: Branch 'feature/table-style' - 2 commits - sw/source
sw/source/core/doc/swtblfmt.cxx | 10 ++ sw/source/core/docnode/ndtbl.cxx |2 +- 2 files changed, 11 insertions(+), 1 deletion(-) New commits: commit 3bbc021a8b091e4f50c9bd453fd11607a7cf45a9 Author: Alex Ivan alexni...@yahoo.com Date: Tue Aug 13 21:17:34 2013 +0300 Parent assigning cleanup Another place where I had previously not modified to the correct function. Change-Id: I1a2d024fcacf9d1de6eb8f5c3cd2e70bcd1771a9 diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 1a7ff43..36763c8 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -492,7 +492,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions rInsTblOpts, } } -SwTableFmt::AssignLineParents( pTableStyle, *pNdTbl ); +SwTableFmt::AssignFormatParents( pTableStyle, *pNdTbl ); // Insert Frms GetNodes().GoNext( aNdIdx ); // Go to the next ContentNode commit fe8c43a6c96f3697553cdc4664ed0defd4dacc83 Author: Alex Ivan alexni...@yahoo.com Date: Tue Aug 13 17:42:13 2013 +0300 Fix borders update with table style application Change-Id: I9d794d96f3542bd3597ab38586df58edff62a16d diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx index 965f3e8..5e3d88d 100644 --- a/sw/source/core/doc/swtblfmt.cxx +++ b/sw/source/core/doc/swtblfmt.cxx @@ -290,6 +290,8 @@ void SwTableFmt::AssignFormatParents( SwTableFmt* pSrcFmt, SwTable rTable ) pLast-InvalidateAll(); pLast-SetCompletePaint(); } + +((SwModify*)pHardFmt)-CheckCaching( RES_BOX ); } void SwTableFmt::AssignLineParents( SwTableFmt* pSrcFmt, SwTable rTable ) @@ -324,6 +326,8 @@ void SwTableFmt::AssignLineParents( SwTableFmt* pSrcFmt, SwTable rTable ) } AssignBoxParents( pFmt, *rTable.GetTabLines()[ n ] ); + +((SwModify*)pLineFmt)-CheckCaching( RES_BOX ); } } @@ -360,6 +364,8 @@ void SwTableFmt::AssignBoxParents( SwTableLineFmt* pSrcLineFmt, SwTableLine rLi if( rLine.GetTabBoxes()[ n ]-GetTabLines().size() ) AssignLineParents_Complex( pSrcLineFmt, pFmt, *rLine.GetTabBoxes()[ n ] ); + +((SwModify*)pBoxFmt)-CheckCaching( RES_BOX ); } } @@ -382,6 +388,8 @@ void SwTableFmt::AssignLineParents_Complex( SwTableLineFmt* pSrcLineFmt, SwTable } AssignBoxParents_Complex( pSrcLineFmt, pSrcBoxFmt, *rBox.GetTabLines()[ n ] ); + +((SwModify*)pLineFmt)-CheckCaching( RES_BOX ); } } @@ -405,6 +413,8 @@ void SwTableFmt::AssignBoxParents_Complex( SwTableLineFmt* pSrcLineFmt, SwTableB if( rLine.GetTabBoxes()[ n ]-GetTabLines().size() ) AssignLineParents_Complex( pSrcLineFmt, pSrcBoxFmt, *rLine.GetTabBoxes()[ n ] ); + +((SwModify*)pBoxFmt)-CheckCaching( RES_BOX ); } } ___ 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.2'
Tag 'libreoffice-4.0.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-08-13 21:30 -0700 Tag libreoffice-4.0.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSCpdPAAoJEPQ0oe+v7q6jRqsQALm7UkgFPIHLuF8Mh6GPGDxV foYMlesdEB0ix1nKaEXmzlyDsMkTwB+CwPGDv96qxd96qWcsVjc5NIgXlYFswQtM OwwEaTGEU2KajVxn27ErbfQwdMRnXDcxIwgv64eOulFEnnfUOzCqSQE8k8QIiJsl 4QZy/nGDTqf4UU6d/oCmofxTOzVP3P6dUkliah6kVT6l8Hl7Jzy4BIS4igqm4rDI 6+pPQXz5p6h/v91F0ui6caoKV33fikd3PQwjPzFdXF9lwfiQuAfMpw63UsyrNSgS wciD/Y9xxUdaplvYWRiSU2LLaSgbzg83ZYxOYprxeHNHOcBnvHtVmQ8XY7cycUUD Dpr0YrYrPlpeUxvV058Zhhv0bwob/8mMR06uuquEig2GqM0vApm+NRe/Fo9L3ddp qG2R/0AjnLdKUfHGs90s9m89Ixha62BU5h984EGH4lSapDKzokpLo2OiYfpI0fnP KBnHU8c8DcNNClCp/BSumVKPYf5YyoyMZYvjzLrwC9QcA/Bh6/XWsBTq0k8WDcBM KfBB6SZbJuGZMkvboK885WN6WEsWYp4gDKMaImIkSx/MwB/985kfrH6WKhN37drp jr7Y5QlVtsEVwivk/gVOhfyl5hAGO1oz7KgUDYB0Aw/rdXyK4xGteQt8BjkpiNgJ U+R2D+kVZ1JoDu8c1rrp =QhnX -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] translations.git: Changes to 'refs/tags/libreoffice-4.0.5.2'
Tag 'libreoffice-4.0.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-08-13 21:30 -0700 Tag libreoffice-4.0.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSCpdQAAoJEPQ0oe+v7q6jcUkP/jvr3tBW9HOwYo7lE6HWGCx5 lhNCG4QsLq9pQJ0qw0MUizOItTBASYZsIayf+wk+jbAEjxSnWlcGP+tDUL//NaPu mGB3h42mRpjAUwXd7D5nqqTul9e0zbJK0y9VDJTbZInPwNhwso7uIScx++C9b4iA itvrI86CozwmBBrIa5laH6NJLwBnif6nlMm9VipoMlc0QHDb1Jf4c7mKsQaazroo 4IT3qkpVzvC1xIMYRun+lFDcOYZmzbBoCausfHz+7ya67RLcqNaK7WddqpB0/NX/ 6NO61a/FRG2vTCFdUZ4+Oh6DtP6ES3XoLR9iVSOvT43xiRj8Q8AnfEEKxQyNQqMr bgGArBdqPKT15vA9nQabyHtv8vJXzDiXF0V9joF0V8tru474bqk/CXYzXSMS/ufF 5GvlLbgLCnJy8lkI3gSbVu8Undb3SPjtlEsZ38hORTGYiUnGWcfOWZ4kexXtmCWC OmREeqOK/QGPSl1a4evvnWDFaP4MIvOgMj5bgk2ycZI5bCiPgJUAA3MP0FJPcEsX z3AXLb5pYyS47e3YQ5pscD16Hofx9FEzY66IDVfHNvUdb3XPGhrMBxfu1Ed/BvE0 snkzu7Byjs2YjiDusHKxJl5SEurHjx28ZR5jBmX/aFgNrlOSBowr96GSn1AifDF3 GyHdcAkhpOlQiH+aISGL =ImPj -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] dictionaries.git: Changes to 'refs/tags/libreoffice-4.0.5.2'
Tag 'libreoffice-4.0.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-08-13 21:29 -0700 Tag libreoffice-4.0.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSCpdCAAoJEPQ0oe+v7q6jk9AP/R+A3s7XumelJ+6swEIadjNe 7yGZ5wJLlJ7dsX6ww52M+HZN8qcHWIXgKepRrqItxflTLYs9FQlbvN1uTD1Y00zS O/M39fY7ya7DrrJ0U2utwYmuYyR4LUUam1+ddXkcu0FPhuTwChm3hzjSQThVoh8E IHWGmhK/mGvuYMAyE+dDD88bB7A5c6RUcSiRgmDZuaFQAFghX/k6rQjSPPUgnbOI 2eOW6GW+HtIGClIP8cvyylrG3/ZyfFwmjJMtBJlytvNItUx56+0HDOUXgg8xV+Rn x/+8BU/P0obIpBuC0E4wHmwUkoy1FIyW73aHSr5D+yfEaHNbeN0JuK+BXeROsGIC tHSR+hm+80zllOfIIyZT84Gh3+ggFyZNca1cuQgIX9cB2FVCGO/ibPx779Yi7fYP zTjel46GxGtKV7floR8t50I6zatfGb32hwdb7kBot3PgXokLWPf8lw4Pniuuu9Iy LccaJwGGe/HTX30lG8nRZQRyM9Ku5a+92Duw7gFWsz3qEpJBjDGiMCcD2S1XEuXR 2Kc26QYIfzPUmsvhEf1sFGNE2paYSNRWDZ10cU9/wyPxfU1lUV6fDHbeKXBrT2mh b4Dw0UUuRmAZv/ZjAMDu/iVV67FaagOMGjt6sbJTQEMZMn83KWZTKxWCbCbXp6H9 Es66QhWkTBZqnHk14WNJ =hiWT -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 ad37b3cc6699f2844f4067c8321e877fee483b0e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Tue Aug 13 22:34:18 2013 +0200
bump product version to 4.0.5.2+, release number to 2
Change-Id: I263899b64806f6ec341308d513a699850ce7a4f3
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 0b85b5d..89a0b10 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.5.1
+UREPACKAGEVERSION 4.0.5.2
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.5.1
+ABOUTBOXPRODUCTVERSION 4.0.5.2
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.1
+PACKAGEVERSION 4.0.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.5.1
+ABOUTBOXPRODUCTVERSION 4.0.5.2
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.1
+PACKAGEVERSION 4.0.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.5.1
+PACKAGEVERSION 4.0.5.2
PACKAGEREVISION 1
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.1
+PACKAGEVERSION 4.0.5.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.1
+PACKAGEVERSION 4.0.5.2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.5.1
+PACKAGEVERSION 4.0.5.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .5.1
+PRODUCTEXTENSION .5.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-
[Libreoffice-commits] core.git: 4 commits - connectivity/source
connectivity/source/drivers/firebird/Columns.cxx | 47 ++-
connectivity/source/drivers/firebird/Columns.hxx |6 ++
connectivity/source/drivers/firebird/Table.cxx |1
connectivity/source/drivers/firebird/Tables.cxx |3 -
4 files changed, 53 insertions(+), 4 deletions(-)
New commits:
commit 73c02c20b19702dbe662fe0d80601049f015d8ac
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 13 17:42:20 2013 +0100
Set ColumnsHelper parent. (firebird-sdbc)
This is needed for accessing the Tables again.
Change-Id: Ibebc017228b9bb47aaabaa4787e4c05d530acccf
diff --git a/connectivity/source/drivers/firebird/Columns.cxx
b/connectivity/source/drivers/firebird/Columns.cxx
index 7fd9aef4..fbf54e0 100644
--- a/connectivity/source/drivers/firebird/Columns.cxx
+++ b/connectivity/source/drivers/firebird/Columns.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
-Columns::Columns(OWeakObject rTable,
+Columns::Columns(Table rTable,
Mutex rMutex,
const TStringVector rVector):
OColumnsHelper(rTable,
@@ -32,6 +32,7 @@ Columns::Columns(OWeakObject rTable,
rMutex,
rVector)
{
+OColumnsHelper::setParent(rTable);
}
ObjectType Columns::createObject(const OUString rColumnName)
diff --git a/connectivity/source/drivers/firebird/Columns.hxx
b/connectivity/source/drivers/firebird/Columns.hxx
index 543bf12..dc006d1 100644
--- a/connectivity/source/drivers/firebird/Columns.hxx
+++ b/connectivity/source/drivers/firebird/Columns.hxx
@@ -21,7 +21,7 @@ namespace connectivity
class Columns: public ::connectivity::OColumnsHelper
{
public:
-Columns(::cppu::OWeakObject rTable,
+Columns(Table rTable,
::osl::Mutex rMutex,
const ::connectivity::TStringVector _rVector);
commit 67a9e7b1a161e96924e2e08b648c513b1a9795e2
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 13 17:33:30 2013 +0100
OTableHelper requires a call to construct() to be usable. (firebird-sdbc)
Without this we get a UnknownPropertyException due to the relevant
properties not being set up.
Change-Id: I3fa956a4a82e411d7aba3895faf58b8a84f9fb5c
diff --git a/connectivity/source/drivers/firebird/Table.cxx
b/connectivity/source/drivers/firebird/Table.cxx
index 7624eee..1cd9813 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -39,6 +39,7 @@ Table::Table(Tables* pTables,
),
m_rMutex(rMutex)
{
+OTableHelper::construct();
}
//- OTableHelper -
commit 6e3118777b7f6cb4df5664df197ac026cca73c16
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 13 13:04:25 2013 +0100
Implement Columns::createObject. (firebird-sdbc)
Change-Id: I5750f640a9bd8bbfc40c0b7ed506d95e9cdbed0f
diff --git a/connectivity/source/drivers/firebird/Columns.cxx
b/connectivity/source/drivers/firebird/Columns.cxx
index c1e7034..7fd9aef4 100644
--- a/connectivity/source/drivers/firebird/Columns.cxx
+++ b/connectivity/source/drivers/firebird/Columns.cxx
@@ -9,12 +9,21 @@
#include Columns.hxx
+#include connectivity/sdbcx/VColumn.hxx
+
+#include com/sun/star/sdbc/XRow.hpp
+
using namespace ::connectivity;
using namespace ::connectivity::firebird;
+using namespace ::connectivity::sdbcx;
using namespace ::cppu;
using namespace ::osl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::uno;
+
Columns::Columns(OWeakObject rTable,
Mutex rMutex,
const TStringVector rVector):
@@ -25,5 +34,40 @@ Columns::Columns(OWeakObject rTable,
{
}
+ObjectType Columns::createObject(const OUString rColumnName)
+{
+uno::Reference XResultSet xColumns =
m_pTable-getConnection()-getMetaData()-getColumns(
+Any(),
+,
+m_pTable-getName(),
+rColumnName);
+
+uno::Reference XRow xRow(xColumns, UNO_QUERY);
+
+if(!xColumns.is() || !xRow.is() || !xColumns-next())
+throw RuntimeException();
+
+ObjectType xColumn(new OColumn(rColumnName, // Name
+ xRow-getString(6), // Type Name
+ xRow-getString(13), // Default Value
+ xRow-getString(12), // Description
+ xRow-getInt(11), // Nullable
+ xRow-getInt(7), // Precision
+ xRow-getInt(9), // Scale
+ xRow-getInt(5), // Type
+
[Libreoffice-commits] core.git: 2 commits - filter/source include/oox oox/Library_oox.mk oox/source sfx2/source
filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu |2
include/oox/core/DocumentCrypt.hxx| 53 +
include/oox/core/filterbase.hxx |5
include/oox/core/xmlfilterbase.hxx|7
oox/Library_oox.mk|1
oox/source/core/DocumentCrypt.cxx | 507
++
oox/source/core/filterbase.cxx| 12
oox/source/core/xmlfilterbase.cxx | 69 +
sfx2/source/dialog/filedlghelper.cxx | 28
9 files changed, 672 insertions(+), 12 deletions(-)
New commits:
commit 651b1d08a19c2770ad6f9ed4a6889faeec73e6ba
Author: Tomaž Vajngerl qui...@gmail.com
Date: Tue Aug 13 23:59:07 2013 +0200
fdo#59524 Also write sheet length so MS Office will open it.
Change-Id: I44407a15ca338bc7a24b5de8f8a60ad4e4f2b03d
diff --git a/oox/source/core/DocumentCrypt.cxx
b/oox/source/core/DocumentCrypt.cxx
index 5e29ee8..b9056ab 100644
--- a/oox/source/core/DocumentCrypt.cxx
+++ b/oox/source/core/DocumentCrypt.cxx
@@ -27,6 +27,8 @@
#include osl/time.h
#include rtl/random.h
+#include com/sun/star/io/XSeekable.hpp
+
namespace oox {
namespace core {
@@ -408,6 +410,13 @@ AesEncoder::AesEncoder(Reference XStream
xDocumentStream, oox::ole::OleStorag
bool AesEncoder::encode()
{
Reference XInputStream xInputStream (
mxDocumentStream-getInputStream(), UNO_SET_THROW );
+Reference XSeekable xSeekable( xInputStream, UNO_QUERY );
+
+if (!xSeekable.is())
+return false;
+
+sal_uInt32 aLength = xSeekable-getLength();
+printf(%d\n, aLength);
if (!mrOleStorage.isStorage())
return false;
@@ -461,7 +470,7 @@ bool AesEncoder::encode()
sal_Int32 inLength;
int outLength;
-aEncryptedPackageStream.writeValuesal_uInt32( 0 ); // size
+aEncryptedPackageStream.writeValuesal_uInt32( aLength ); // size
aEncryptedPackageStream.writeValuesal_uInt32( 0 ); // size
do
commit 3423db6f81dfcd3993178a70bde7c69a0c02c302
Author: Tomaž Vajngerl qui...@gmail.com
Date: Tue Aug 13 23:25:24 2013 +0200
fdo#59524 Encryption for MS Office 2007 Spreadsheet documents
This enables saving of MS 2007 spreadsheet documents with a password.
The encryption used is the same as used in Office 2007 (however
different than in Office 2010 and 2013 which use agile encryption).
Change-Id: I3539e811d95b6f9178246ab269d13bb385a48bd2
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
index 7f1fddd..555ccb1 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
node oor:name=Calc MS Excel 2007 XML oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN 3RDPARTYFILTER
PREFERRED/value/prop
+prop oor:name=FlagsvalueIMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED
ENCRYPTION PASSWORDTOMODIFY/value/prop
prop oor:name=UIComponent/
prop
oor:name=FilterServicevaluecom.sun.star.comp.oox.xls.ExcelFilter/value/prop
prop oor:name=UserData/
diff --git a/include/oox/core/DocumentCrypt.hxx
b/include/oox/core/DocumentCrypt.hxx
new file mode 100644
index 000..3010236
--- /dev/null
+++ b/include/oox/core/DocumentCrypt.hxx
@@ -0,0 +1,53 @@
+/* -*- 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 DOCUMENTCRYPTO_HXX
+#define DOCUMENTCRYPTO_HXX
+
+#include oox/dllapi.h
+
+#include oox/ole/olestorage.hxx
+#include com/sun/star/io/XStream.hpp
+
+namespace oox {
+namespace core {
+
+class OOX_DLLPUBLIC AesEncoder
+{
+private:
+com::sun::star::uno::Reference com::sun::star::io::XStream
mxDocumentStream;
+oox::ole::OleStorage mrOleStorage;
+OUString maPassword;
+
+public:
+AesEncoder(
+com::sun::star::uno::Reference
[Libreoffice-commits] core.git: oox/source
oox/source/core/DocumentCrypt.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit ecb842e71e6cd17cc9f19e7dbc975de90d8603ae Author: Tomaž Vajngerl qui...@gmail.com Date: Wed Aug 14 00:29:49 2013 +0200 Remove printf statement Change-Id: Ibae83ef39dec7270c287ee04e38efa0bc5af48ac diff --git a/oox/source/core/DocumentCrypt.cxx b/oox/source/core/DocumentCrypt.cxx index b9056ab..6fe59ab 100644 --- a/oox/source/core/DocumentCrypt.cxx +++ b/oox/source/core/DocumentCrypt.cxx @@ -416,7 +416,6 @@ bool AesEncoder::encode() return false; sal_uInt32 aLength = xSeekable-getLength(); -printf(%d\n, aLength); if (!mrOleStorage.isStorage()) return false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/Library_sc.mk sc/qa sc/source
sc/Library_sc.mk |1
sc/inc/column.hxx |2
sc/inc/columnset.hxx | 40 +
sc/inc/refupdatecontext.hxx|2
sc/inc/table.hxx |5 +
sc/qa/unit/ucalc.hxx |2
sc/qa/unit/ucalc_sharedformula.cxx | 63 +
sc/source/core/data/column.cxx |5 +
sc/source/core/data/column3.cxx| 108 ++---
sc/source/core/data/columnset.cxx | 66 ++
sc/source/core/data/document.cxx | 12 ++--
sc/source/core/data/table2.cxx | 26 +++-
12 files changed, 286 insertions(+), 46 deletions(-)
New commits:
commit c4d26f327605b77c8395bdb512d8ddcd8c11bfd1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Aug 13 22:53:14 2013 -0400
Regroup formula cells later in columns where references are updated.
Change-Id: I4dd6ade18e72d8f57583180463f9dda3603be4c2
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 6f559f5..83e3358 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/column2 \
sc/source/core/data/column3 \
sc/source/core/data/columniterator \
+ sc/source/core/data/columnset \
sc/source/core/data/columnspanset \
sc/source/core/data/compressedarray \
sc/source/core/data/colorscale \
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 22bb9bd..14d0bfe 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -329,7 +329,7 @@ public:
* @return true if reference of at least one formula cell has been
* updated, false otherwise.
*/
-bool UpdateReference( const sc::RefUpdateContext rCxt, ScDocument*
pUndoDoc = NULL );
+bool UpdateReference( sc::RefUpdateContext rCxt, ScDocument* pUndoDoc =
NULL );
void UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt );
void UpdateInsertTabOnlyCells( sc::RefUpdateInsertTabContext rCxt );
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
new file mode 100644
index 000..fb56303
--- /dev/null
+++ b/sc/inc/columnset.hxx
@@ -0,0 +1,40 @@
+/* -*- 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/.
+ */
+
+#ifndef SC_COLUMNSET_HXX
+#define SC_COLUMNSET_HXX
+
+#include address.hxx
+
+#include vector
+#include boost/unordered_set.hpp
+#include boost/unordered_map.hpp
+
+namespace sc {
+
+/**
+ * Simple container to keep track of sheet - column pair.
+ */
+class ColumnSet
+{
+typedef boost::unordered_setSCCOL ColsType;
+typedef boost::unordered_mapSCTAB, ColsType TabsType;
+TabsType maTabs;
+
+public:
+void set(SCTAB nTab, SCCOL nCol);
+bool has(SCTAB nTab, SCCOL nCol) const;
+void getColumns(SCTAB nTab, std::vectorSCCOL rCols) const;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index f5ca4d0..ba0beed 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -12,6 +12,7 @@
#include global.hxx
#include address.hxx
+#include columnset.hxx
#include boost/unordered_map.hpp
#include boost/unordered_set.hpp
@@ -66,6 +67,7 @@ struct RefUpdateContext
SCTAB mnTabDelta;
UpdatedRangeNames maUpdatedNames;
+ColumnSet maRegroupCols;
RefUpdateContext(ScDocument rDoc);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index a95f2bc..fa6247c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -58,6 +58,7 @@ namespace sc {
class CopyToDocContext;
class MixDocContext;
class ColumnSpanSet;
+class ColumnSet;
struct ColumnBlockPosition;
struct RefUpdateContext;
struct RefUpdateInsertTabContext;
@@ -388,8 +389,8 @@ public:
boolTestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
const;
voidInsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow,
SCSIZE nSize );
-voidDeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow,
SCSIZE nSize,
-bool* pUndoOutline = NULL );
+void DeleteCol(
+const sc::ColumnSet rRegroupCols, SCCOL nStartCol, SCROW nStartRow,
SCROW nEndRow, SCSIZE nSize, bool* pUndoOutline = NULL );
voidDeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uInt16 nDelFlag);
void CopyToClip( sc::CopyToClipContext rCxt, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, ScTable* pTable );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index e4ad8c7..d8c3e60 100644
--- a/sc/source/core/data/column.cxx
+++
Re: [Libreoffice-qa] Bugzilla Migration Plan
Hi bfoman, Liebe Grüße, / Yours, Florian Reisinger Am 12.08.2013 um 21:58 schrieb bfoman bfo.bugm...@spamgourmet.com: Robinson Tryon wrote [...] Hi! I think this should be all or nothing operation - LibreOffice bugs moved to new instance along with every account that touched the bug. Personally I would like to have my account auto-moved, just like big mail systems do it. Explanation before, during and after, good FAQ about the rationale and change password link in welcome message would be welcomed. Not mentioning all personal searches, settings, tags intact. You meant Directly to a new instance? I fear we are not allowed to do this, because of privacy issues... [...] Best regards. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
Hi Jochen, all I think this is a GREAT idea! Jochen wrote 2) What benefits? IMO the main advantage would be to remove another one or two layers of obstacles for the user 1) Instead of having to select the project from a long list where LibreOffice is somewhere in the middle (https://bugs.freedesktop.org/enter_bug.cgi) you would start here https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMED 2) If OpenID can be implemented (unfortunately I think it's an unsolvable problem with OpenID https://bugzilla.mozilla.org/show_bug.cgi?id=294608) or BrowserID or any other ID thing that removes the need for yet another registration it would be fantastic Jochen wrote 3) Never change a running system Agreed. Unless that system does not /no longer suit your needs or is user unfriendly thus defeating it's purpose :) Just my 2 cents... -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Bugzilla-Migration-Plan-tp4069765p4069823.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
Florian Reisinger wrote You meant Directly to a new instance? I fear we are not allowed to do this, because of privacy issues... Hi! So lets check bugs.freedesktop.org, www.libreoffice.org/bugzilla, www.libreoffice.org/get-help/bug/, or whatever is the other link to the same Bugzilla instance Privacy Policy. Wait, I don't recollect to read anything more than the following: /PRIVACY NOTICE: Bugzilla is an open bug tracking system. Activity on most bugs, including email addresses, will be visible to the public. We recommend using a secondary account or free web email service (such as Gmail, Yahoo, Hotmail, or similar) to avoid receiving spam at your primary email address. / This Bugzilla is already available at www.libreoffice.org/bugzilla so I think it is just technical operation. No lawyers involved as there is no privacy policy whatsoever (well, this could make some concerned, not mentioning EU cookie law hunters). I cannot imagine a per user ask for ack migration of more than 8000 accounts of people ever reported in LibreOffice product. Bugzilla bugs are connected to UserIDs. You pretty much can't delete an account without a risk of getting referential integrity problems in your database . On the other hand having orphaned bugs with artificial UserIDs and then reassigning bugs back to reporters by hand or scripting sounds like horror story. Also having bugs anonymized doesn't have much sense. Best regards. BTW: You can read OpenOffice Bugzilla to Apache migration announcement here - http://mail-archives.apache.org/mod_mbox/incubator-ooo-users/201109.mbox/%3CSNT126-DS17794D26E0ACE2103DEE6CDB1A0%40phx.gbl%3E. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Bugzilla-Migration-Plan-tp4069765p4069871.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
Hi! Some comments: -No default assingie (If no one is assigned, then no one is assigned - so easy to understand) This is mandatory field in Bugzilla. Anyway, default assignee allows to watch new bugs filed in components - whether by mailinglist or by watching special account (like compon...@libreoffice.bugs). -Implementation of take for QA contact, which should not be too difficult... This is already available in Bugzilla 4.4. -No whiteboard status for QA any more (only keywords, which do not need to be tested. Yep, can be disabled by usestatuswhiteboard. - More then one version field (we might discuss that) One for earliest tested version, where the bug exists and one for the latest tested version. IMHO we could do some nice (and thus helpful queries) Only one version field is possible by default. This could be enabled by other means - flags or custom fields. - Have our bugzilla code stored in git -Bugzilla updates via cvs... CVS is rather rusty... Well, there are https://wiki.documentfoundation.org/QA-ImprovingBugzilla and https://wiki.documentfoundation.org/How_to_Improve_Bugzilla articles already. I think they should be updated before migration. Some test installation could be installed to allow pick up the best settings, extensions, customizations. And when all is prepared - do it. Best regards. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Bugzilla-Migration-Plan-tp4069765p4069876.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
Hi, Am 13.08.2013 17:52, schrieb bfoman: Florian Reisinger wrote You meant Directly to a new instance? I fear we are not allowed to do this, because of privacy issues... Hi! So lets check bugs.freedesktop.org, www.libreoffice.org/bugzilla, www.libreoffice.org/get-help/bug/, or whatever is the other link to the same Bugzilla instance Privacy Policy. Wait, I don't recollect to read anything more than the following: /PRIVACY NOTICE: Bugzilla is an open bug tracking system. Activity on most bugs, including email addresses, will be visible to the public. We recommend using a secondary account or free web email service (such as Gmail, Yahoo, Hotmail, or similar) to avoid receiving spam at your primary email address. / This Bugzilla is already available at www.libreoffice.org/bugzilla so I think it is just technical operation. No lawyers involved as there is no privacy policy whatsoever (well, this could make some concerned, not mentioning EU cookie law hunters). The fact is: data is @freedesktop. In the and data is @libreoffice. IMHO the problem is the German law, which forbids us to continue using the data (I really hope it is a law worldwide) I really do hope at some point that I am wrong, that would easify everything, but I do not believe it I cannot imagine a per user ask for ack migration of more than 8000 accounts of people ever reported in LibreOffice product. Bugzilla bugs are connected to UserIDs. You pretty much can't delete an account without a risk of getting referential integrity problems in your database . On the other hand having orphaned bugs with artificial UserIDs and then reassigning bugs back to reporters by hand or scripting sounds like horror story. Also having bugs anonymized doesn't have much sense. Best regards. BTW: You can read OpenOffice Bugzilla to Apache migration announcement here - http://mail-archives.apache.org/mod_mbox/incubator-ooo-users/201109.mbox/%3CSNT126-DS17794D26E0ACE2103DEE6CDB1A0%40phx.gbl%3E. Thanks for this link -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Bugzilla-Migration-Plan-tp4069765p4069871.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ -- Liebe Grüße, / Yours, Florian Reisinger ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
On Tue, Aug 13, 2013 at 5:05 AM, Petr Mladek pmla...@suse.cz wrote: It would be great to avoid the ask for permission step if possible. It would be a lot of work. It would be a lot of work; yes, we should ask a lawyer :-) Note that the overloaded FDO bugzilla admins would need to extract the user infos selectively again and again. There are a couple of ways to speed up the please-re-enable-my-account process. That being said, I think if we ask people a month or so before the transfer, I'm hopeful that we can get 90%+ of the currently-active bugzilla accounts, so the workload might not be that huge... Also I am afraid that we will not get many approvals because people simply won't mind. yep, yep Also I am not sure about the point: - Add a default license/ToS for all users/new bugs (I suggest CC-BY-SA 3.0 for consistency) Right now it sounds like we're unsure if we transfer data/comments from FDO because there's no license on that data, and no ToS (that I can see) anywhere on the FDO/Bugzilla site. If we had such a license/ToS on there right now, the whole discussion about 'can we transfer data?' would be moot. Even if we didn't have this hurdle in front of us right now, I'd still think it would be a good idea to clarify our usage terms for the bugtracker data. Given that we *actually* need to address this problem before a migration can proceed, I think we'd be foolish not to prevent this problem from occurring in the future :-) On one hand it would be interesting to get test documents under certain license. On the other hand, people must not be scared to attach them. Also we should not overengineer it ;-) True, true. A particular CC license might not work for all use cases, especially with test documents attached to bugs. My primary focus here would be to ease any future data transitions in the future; we'd probably want to do some brainstorming and/or ping some other FOSS projects for advice on this topic. Finally, I support the idea of our own bugzilla. It might solve many of the mentioned problems. On the other hand, I am still a bit unsure about the needed work. Do we already have a volunteer who could maintain it? ;-) I'm going to defer to Joel regarding the workload for day-to-day administration of projects in Bugzilla, but I think that the QA Team usually has that aspect of the bug tracker under control. Regarding the backend sysadmin aspects, I don't think that there'd be much required beyond security upgrades. Cheers, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] QA, say hello to ProjectLibre
Marc O'Brien, co-founder of ProjectLibre, stopped by the dev list to say hi (see his message at the end of this email). Marc - Please feel welcome to ping the QA Team on this list or to stop by our IRC channel on freenode (#libreoffice-qa). If you have any questions about how we approach QA or just want to say hi, please stop by :-) It looks like ProjectLibre is mostly Sourceforge-based right now, but if you guys are ever thinking about adding some new services to your infrastructure and want to pick our brains, just ping us. We have a bunch of neat tools (including a custom front-end to Bugzilla) that you might find useful :-) Cheers, -- Robinson -- Forwarded message -- From: Marc O'Brien mobr...@projectlibre.com Date: Tue, Aug 13, 2013 at 12:36 PM Subject: Introducing ProjectLibre compliment to LibreOffice and replaces Microsoft Project To: libreoff...@lists.freedesktop.org Hello everyone, I wanted to introduce ProjectLibre http://www.projectlibre.org to the LibreOffice community. I have sent an email to Florian on becoming more involved with TDF. ProjectLibre is a replacement of Microsoft Project (which is a multi-billion dollar part of the Office family). There was a great article ProjectLibre edges in on Microsoft Project dominance http://opensource.com/business/13/5/projectlibre-microsoft-project We currently are being used in over 200 countries and will have a major new release in the late Fall. We are a small dedicated group. It would be wonderful to get support in promoting ProjectLibre around the world. Our major needs are getting the word out, translations, improved documentation and a website cleanup. I have known many of the LibreOffice people over the years and very pleased to see the great progress. I will help promote LibreOffice and hope we can jointly make a major impact! All the best, Marc -- *Marc O'Brien Co-Founder http://ProjectLibre.orgProjectLibre.org http://www.projectlibre.org* * **The open source replacement of Microsoft Project* ___ LibreOffice mailing list libreoff...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
bfoman wrote Great, so now you can test a bunch of useful extensions enabled on bugzilla.mozilla.org: http://bzr.mozilla.org/bmo/4.0/files/head:/extensions/ I really like My product dashboard or /page.cgi?id=triage_reports.html search page I am sorry - correct links: http://bzr.mozilla.org/bmo/4.2/files http://bzr.mozilla.org/bmo/4.2/annotate/head:/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Bugzilla-Migration-Plan-tp4069765p4069894.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bugzilla Migration Plan
Hi, On 12-08-13 19:54, Robinson Tryon wrote: Hi All, We've been talking recently about migrating our bugtracker to our own server. There are a number of benefits to such a migration, but we've often glossed-over some of the details of how to effect such a move. Great. I think it really helps to have our own Bugzilla. -- Greetings, Rob Snelders ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 45349] Formula disappears after editing
https://bugs.freedesktop.org/show_bug.cgi?id=45349 --- Comment #29 from collette ycollette.nos...@free.fr --- When I see the importance of this bug and that release after release of libreoffice, nothing happens around the formula editor Are you still interested in the formula editor ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62155] Libreoffice crashes after upgrade while using formula bar
https://bugs.freedesktop.org/show_bug.cgi?id=62155 --- Comment #17 from Sai Gopal saigop...@gmail.com --- Hi, The problem is not yet resolved even with the new version 4.1.0 Regards, Sai Gopal On Mon, Aug 12, 2013 at 1:29 PM, bugzilla-dae...@freedesktop.org wrote: tommy27 ba...@quipo.it changed bug 62155https://bugs.freedesktop.org/show_bug.cgi?id=62155 What Removed Added Status REOPENED NEEDINFO CC ba...@quipo.it *Comment # 16 https://bugs.freedesktop.org/show_bug.cgi?id=62155#c16on bug 62155 https://bugs.freedesktop.org/show_bug.cgi?id=62155 from tommy27ba...@quipo.it * it would be interesting to know if MacOS user still experience this bug. if not, Wiebe Cazemier should open a separate bug report about Linux. in the meantime I change status to NEEDINFO. -- You are receiving this mail because: - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39484] All Outline groups of sheet lost while editing
https://bugs.freedesktop.org/show_bug.cgi?id=39484 --- Comment #51 from Winfried Donkers winfrieddonk...@libreoffice.org --- (In reply to comment #50) @Winfried do you still reproduce this bug with recent 4.0.4 or 4.1.0 releases? AFAIK we haven't encountered this bug with version 4.0 (4.1 isn't ready for company use yet). The bug occurs very rarely, but -given the data loss- it is a bad one. My guess is that it is connected to certain (long existing) files. With two files it has occurred multiple times, with hundreds of other files is has never occurred (and these files all have the same base file from which they originate, first an xls-file, now an ods file). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68006] Macros: Beep emits sound even if playback device is muted
https://bugs.freedesktop.org/show_bug.cgi?id=68006 Miklos Vajna vmik...@suse.cz changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG --- Comment #2 from Miklos Vajna vmik...@suse.cz --- Oh, indeed. Yes, the above beeps as well. And tweaking pulseaudio to capture XBell is possible: https://bugzilla.redhat.com/show_bug.cgi?id=607393#c15 So not a bug on our side. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62155] Libreoffice crashes after upgrade while using formula bar
https://bugs.freedesktop.org/show_bug.cgi?id=62155 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #18 from tommy27 ba...@quipo.it --- Ok. setting back status to NEW. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39484] All Outline groups of sheet lost while editing
https://bugs.freedesktop.org/show_bug.cgi?id=39484 --- Comment #52 from tommy27 ba...@quipo.it --- so are you saying that it has never reoccurred yet in 4.0.x or that it still happens rarely? or that it happened rarely in 3.6.x... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68042] New: FILESAVE: Window FREEZE
https://bugs.freedesktop.org/show_bug.cgi?id=68042 Priority: medium Bug ID: 68042 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: Window FREEZE Severity: normal Classification: Unclassified OS: Windows (All) Reporter: nick.hickm...@atlagri.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 3.6.4.3 release Component: Spreadsheet Product: LibreOffice Problem description: When setting 'Window Freeze' [to keep a row of cells as a Header], this is not always saved and when re-opening the file the setting has gone rendering my spreadsheet without header rows]. This worked fine on versions prior to 3.6 and I recently upgraded to 4.04 only to find the same situation. Operating System: Windows 7 Version: 3.6.4.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39484] All Outline groups of sheet lost while editing
https://bugs.freedesktop.org/show_bug.cgi?id=39484 --- Comment #53 from Winfried Donkers winfrieddonk...@libreoffice.org --- (In reply to comment #52) so are you saying that it has never reoccurred yet in 4.0.x or that it still happens rarely? or that it happened rarely in 3.6.x... The bug hasn't occurred with version 3.5.5 or earlier (we think), it seemed to start with 3.6, but we know of at least one instance when the bug occurred with version 3.5.7. We upgraded from 3.5.7 to 4.0.4 and so far, I have not received reports of the bug. (BTW we are currently moving the data from these calc-documents to our ERP-platform, which means that we are likely to experience the bug even less, as these calc-documents become read-only once the data is moved. I will so be of limited 'use' with respect to this bug.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66827] Can't select other fill than color in Writer -- Drawing functions
https://bugs.freedesktop.org/show_bug.cgi?id=66827 samuel_w...@web.de changed: What|Removed |Added CC||samuel_w...@web.de --- Comment #4 from samuel_w...@web.de --- Can confirm this bug in LO Version: 4.1.0.4 Build ID: 89ea49ddacd9aa532507cbf852f2bb22b1ace28 The Drawing Object Properties Toolbar do not work as expected. right click - Area... on the circle to set color none work as expected. OS Debian 7.1 amd64 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68042] FILESAVE: Window FREEZE
https://bugs.freedesktop.org/show_bug.cgi?id=68042 Urmas davian...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Urmas davian...@gmail.com --- What is the file format of your spreadsheet? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68044] New: This presentation always crashes LibreOffice Impress when press F5 for presenting
https://bugs.freedesktop.org/show_bug.cgi?id=68044 Priority: medium Bug ID: 68044 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: This presentation always crashes LibreOffice Impress when press F5 for presenting Severity: major Classification: Unclassified OS: Linux (All) Reporter: k...@mail.orbitel.bg Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.1.0.4 release Component: Presentation Product: LibreOffice Created attachment 84000 -- https://bugs.freedesktop.org/attachment.cgi?id=84000action=edit A presentation file The attached presentation always crashes LibreOffice Impress when user is pressing F5 to start the presentation. The message I get is some thing like The software LibreOffice (soffice.bin) get fatal error and it is the reason for error signal 11 (SIGSEGV) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68045] New: User defined date acceptance patterns are used only for default language
https://bugs.freedesktop.org/show_bug.cgi?id=68045 Priority: medium Bug ID: 68045 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: User defined date acceptance patterns are used only for default language Severity: normal Classification: Unclassified OS: All Reporter: pmla...@suse.cz Hardware: Other Status: UNCONFIRMED Version: 4.0.4.2 release Component: Spreadsheet Product: LibreOffice Created attachment 84001 -- https://bugs.freedesktop.org/attachment.cgi?id=84001action=edit Test document (test-dates,ods) Users might define additional date acceptance patterns in Tools/Options/Language Settings/Languages/Date acceptance patterns. But it seems that these are used only for cells with the default language. Steps to reproduce: 1. Make sure that D/M is listed in Tools/Options/Language Settings/Languages/Date acceptance patterns 2. Open the attached test-dates.ods 3. Enter 14/9 in the cell [A3] Result: The value 14/9 is saved as is. Expected Result: The value should get interpreted as D/M date and saved as June 14.9.2013 Observation: The problem exists in the cell [A3] that is formatted with Czech language. It works as expected in the cell [B3] that is formatted with the default language. Motivation: The problem is annoying when you need to edit documents formatted by another person and you are used to some date acceptance patterns. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68045] User defined date acceptance patterns are used only for default language
https://bugs.freedesktop.org/show_bug.cgi?id=68045 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||er...@redhat.com Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68046] Crash related to undo/redo
https://bugs.freedesktop.org/show_bug.cgi?id=68046 Milan Bouchet-Valat nalimi...@club.fr changed: What|Removed |Added Version|4.0.3.3 release |4.1.0.4 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68048] New: Autocorrect patterns are preferred over date acceptance patterns.
https://bugs.freedesktop.org/show_bug.cgi?id=68048 Priority: medium Bug ID: 68048 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Autocorrect patterns are preferred over date acceptance patterns. Severity: normal Classification: Unclassified OS: All Reporter: pmla...@suse.cz Hardware: Other Status: UNCONFIRMED Version: 4.0.4.2 release Component: Spreadsheet Product: LibreOffice It would be great if all valid D/M date patterns are accepted as dates. This is not true for 1/2, 1/4, and 3/4 which seems to be handled by the autocorrection stuff. Steps to reproduce: 1. Make sure that D/M is listed in Tools/Options/Language Settings/Languages/Date acceptance patterns 2. Try to enter the following dates: 1/1, 1/2, 1/3, 1/4, 1/5, 3/4 Result: 1/1, 1/3, 1/5 are interpreted as dates but 1/2, 1/3, and 3/4 are replaced by the related autocorrect strings. Expected Result: All the values should get interpreted as dates Motivation: For normal users (my wife), it is quite surprising that only the three variants 1/2,1/4, 3/4 are handled different way ;-) IMHO, dates are much more used by Calc users than fractions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68047] New: EDITING: fill with series isn't working without selecting of cell group
https://bugs.freedesktop.org/show_bug.cgi?id=68047 Priority: medium Bug ID: 68047 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: fill with series isn't working without selecting of cell group Severity: normal Classification: Unclassified OS: Windows (All) Reporter: i...@citromail.hu Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Spreadsheet Product: LibreOffice Hi, I wanted to make a series from 1 to 2048 step by 1 in LibreOffice Calc. This menu active only if I select min. 2 cell, but it cannot fill the range with the required values. It is a very annoying bug. If I enter the start value and the final value and the step value, why should I select the range before it? I think it would be a base function. The demand: select a cell, in the edit menu-fill-series, enter the required values, ok. If there is any solution for this missing function, please inform me. Regards, Imre -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68048] Autocorrect patterns are preferred over date acceptance patterns.
https://bugs.freedesktop.org/show_bug.cgi?id=68048 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||er...@redhat.com Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68048] Autocorrect patterns are preferred over date acceptance patterns.
https://bugs.freedesktop.org/show_bug.cgi?id=68048 --- Comment #1 from Petr Mladek pmla...@suse.cz --- Created attachment 84002 -- https://bugs.freedesktop.org/attachment.cgi?id=84002action=edit Test document showing the problem -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68042] FILESAVE: Window FREEZE
https://bugs.freedesktop.org/show_bug.cgi?id=68042 --- Comment #2 from nick.hickm...@atlagri.com --- It is saved in *.xls format and has been since we started using LibreOffice when it was first launched - I have saved in *.ods to test and it has opened again OK on this occasion. On 13 August 2013 10:11, bugzilla-dae...@freedesktop.org wrote: Urmas davian...@gmail.com changed bug 68042https://bugs.freedesktop.org/show_bug.cgi?id=68042 What Removed Added Status UNCONFIRMED NEEDINFO Ever confirmed 1 *Comment # 1 https://bugs.freedesktop.org/show_bug.cgi?id=68042#c1 on bug 68042 https://bugs.freedesktop.org/show_bug.cgi?id=68042 from Urmasdavian...@gmail.com * What is the file format of your spreadsheet? -- You are receiving this mail because: - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68049] New: Other: LibreOffice Impress: Unable to set object height
https://bugs.freedesktop.org/show_bug.cgi?id=68049 Priority: medium Bug ID: 68049 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: LibreOffice Impress: Unable to set object height Severity: normal Classification: Unclassified OS: Linux (All) Reporter: icuin...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.0.1 rc Component: Libreoffice Product: LibreOffice Problem description: Unable to set exact height of any graphic object in LibreOffice Impress. Steps to reproduce: 1. Launch LibreOffice Impress 2. Click on Basic Shapes and select Circle 3. Click and drag anywhere in the slide to create a circle. 4. While circle is selected, in the menu bar click format position and size 5. Set height to some numerical value say 5 6. Click ok. 7. NOTHING HAPPENS :( Current behavior: Nothing Happens Expected behavior: Height should change Operating System: Fedora Version: 4.1.0.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67313] Libreoffice 4.1 tries to load URE's store.dll from Windows directory
https://bugs.freedesktop.org/show_bug.cgi?id=67313 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |dtar...@redhat.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68050] New: UI: Fields dialog does not preserve scroll position when focussed
https://bugs.freedesktop.org/show_bug.cgi?id=68050 Priority: medium Bug ID: 68050 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Fields dialog does not preserve scroll position when focussed Severity: normal Classification: Unclassified OS: Linux (All) Reporter: fredd...@yahoo.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.0.1.2 release Component: Writer Product: LibreOffice Problem description: In the Cross-references tab of the Fields dialog, there is a scrollable Selection field with references. When the dialog has no focus and you scroll over it and click a reference, it will reset the scroll position to where it was left the last time the dialog had focus, and the click will insert the wrong reference. Steps to reproduce: 1. Insert into a document several items for which cross-references can be created (end notes etc.) 2. Click in the menu Insert → Cross-Reference 3. Focus the document (for example to continue writing while keeping the dialog open) 4. Hover over the Selection list and scroll down 5. Click the reference that is below the cursor in order to insert it. Current behavior: As soon as the dialog gets focussed, the scrollable list resets to the position where it was when it had focus the last time. Now item below the cursor is a different one and the wrong cross-reference is inserted. Expected behavior: The list does not change its scroll position when it gets focus. Thus the cross-reference is inserted that is below the cursor when the click happened. This issue happens in both Ubuntu 13.04 (Unity) and 10.04 (Gnome). Operating System: Ubuntu Version: 4.0.1.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68044] This presentation always crashes LibreOffice Impress when press F5 for presenting
https://bugs.freedesktop.org/show_bug.cgi?id=68044 tbehr...@suse.com changed: What|Removed |Added Attachment #84000|text/plain |application/vnd.ms-powerpoi mime type||nt -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62155] Libreoffice crashes after upgrade while using formula bar
https://bugs.freedesktop.org/show_bug.cgi?id=62155 --- Comment #19 from Sai Gopal saigop...@gmail.com --- On Tue, Aug 13, 2013 at 12:20 PM, Sai Gopal saigop...@gmail.com wrote: Hi, The problem is not yet resolved even with the new version 4.1.0 Regards, Sai Gopal On Mon, Aug 12, 2013 at 1:29 PM, bugzilla-dae...@freedesktop.org wrote: tommy27 ba...@quipo.it changed bug 62155https://bugs.freedesktop.org/show_bug.cgi?id=62155 What Removed Added Status REOPENED NEEDINFO CC ba...@quipo.it *Comment # 16 https://bugs.freedesktop.org/show_bug.cgi?id=62155#c16on bug 62155 https://bugs.freedesktop.org/show_bug.cgi?id=62155 from tommy27ba...@quipo.it * it would be interesting to know if MacOS user still experience this bug. if not, Wiebe Cazemier should open a separate bug report about Linux. in the meantime I change status to NEEDINFO. -- You are receiving this mail because: - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68044] This presentation always crashes LibreOffice Impress when press F5 for presenting
https://bugs.freedesktop.org/show_bug.cgi?id=68044 tbehr...@suse.com changed: What|Removed |Added CC||tbehr...@suse.com --- Comment #1 from tbehr...@suse.com --- Works on a recent master build. Can you attach a backtrace, howto is here please: https://wiki.documentfoundation.org/QA/BugReport/Debug_Information#GNU.2FLinux:_How_to_get_a_backtrace ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68051] New: UI: Contextual dialogs steal focus when hidden/shown again
https://bugs.freedesktop.org/show_bug.cgi?id=68051 Priority: medium Bug ID: 68051 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Contextual dialogs steal focus when hidden/shown again Severity: normal Classification: Unclassified OS: Linux (All) Reporter: fredd...@yahoo.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.0.1.2 release Component: Writer Product: LibreOffice Problem description: Certain dialogs and toolbars are contextual and hide when a different item is selected. For example when a frame or image is selected, certain the cross-reference dialog is hidden. When clicking into a paragraph to continue writing, these dialogs are shown again and catch focus. The focus should be where the click event happened (document window where text cursor has been placed). Steps to reproduce: 1. Insert an image or frame. 1. Open the fields dialog (menu Insert → Cross-Reference). 2. Select the image or frame: the Fields dialog hides. 3. Click into the paragraph. Current behavior: The Fields dialog shows again and catches focus. Expected behavior: The paragraph in the document window should keep focus. Operating System: Ubuntu Version: 4.0.1.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
